revno: 3987

revision-id: holyfoot@askmonty.org-20140206152705-e5bv7dhvwgq7xsws

parent: sergii@pisem.net-20140206152540-sj1qafhe9aztoek9

fixes bug: https://mariadb.atlassian.net/browse/MDEV-4439

committer: Alexey Botchkov <holyfoot@askmonty.org>

branch nick: 10.0

timestamp: Thu 2014-02-06 16:27:05 +0100

message:

  MDEV-4439 ALTER TABLE .. [ADD|DROP] FOREIGN KEY IF [NOT] EXISTS does not work if constraint name is not used.

    Patches for server and the Innodb engine.

    Server is fixed so it does nothing if no indexes left to alter.

    Innodb parser is fixed so it looks for the IF [NOT] EXISTS option in a string.

    Another change is that it uses the index name for the internal dictionary.

    Prior to that it only used the CONSTRAINT name for it.

--- /mnt/buildbot/build/mariadb-10.0.9/mysql-test/suite/innodb/r/innodb_mysql.result	2014-02-13 12:55:16.000000000 +0200

+++ /mnt/buildbot/build/mariadb-10.0.9/mysql-test/suite/innodb/r/innodb_mysql.reject	2014-02-13 17:12:41.000000000 +0200

@@ -1700,8 +1700,8 @@

   PRIMARY KEY (`c`,`d`),

   CONSTRAINT `c1` FOREIGN KEY (`c`) REFERENCES `t1` (`a`) ON DELETE NO ACTION,

   CONSTRAINT `c2` FOREIGN KEY (`c`) REFERENCES `t1` (`a`) ON UPDATE NO ACTION,

-  CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`c`) REFERENCES `t1` (`a`) ON UPDATE NO ACTION,

-  CONSTRAINT `t2_ibfk_2` FOREIGN KEY (`c`) REFERENCES `t1` (`a`) ON UPDATE NO ACTION

+  CONSTRAINT `f3` FOREIGN KEY (`c`) REFERENCES `t1` (`a`) ON UPDATE NO ACTION,

+  CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`c`) REFERENCES `t1` (`a`) ON UPDATE NO ACTION

 ) ENGINE=InnoDB DEFAULT CHARSET=latin1

 DROP TABLE t2;

 DROP TABLE t1;