bzr push into mysql-next-mr-bugfixing branch (holyfoot:3222)

[Alexey Botchkov]

 3222 Alexey Botchkov	2010-05-31 [merge]
      merging.

    modified:
      client/Makefile.am
=== modified file 'mysql-test/r/alter_table.result'
--- a/mysql-test/r/alter_table.result	2010-02-20 10:07:32 +0000
+++ b/mysql-test/r/alter_table.result	2010-05-31 13:33:38 +0000
@@ -1366,3 +1366,7 @@ ERROR HY000: Incorrect prefix key; the u
 CREATE INDEX i2 ON t1 (a(20));
 ERROR HY000: Incorrect prefix key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique prefix keys
 DROP TABLE t1;
+CREATE TABLE t1 (id int);
+INSERT INTO t1 VALUES (1), (2);
+ALTER TABLE t1 ADD COLUMN (f1 INT), ADD COLUMN (f2 INT), ADD KEY f2k(f2);
+DROP TABLE t1;

=== modified file 'mysql-test/t/alter_table.test'
--- a/mysql-test/t/alter_table.test	2010-02-11 17:02:41 +0000
+++ b/mysql-test/t/alter_table.test	2010-05-31 13:33:38 +0000
@@ -1117,3 +1117,14 @@ CREATE INDEX i2 ON t1 (a(20));
 # cleanup
 DROP TABLE t1;
 
+
+#
+# Bug #45052    ALTER TABLE ADD COLUMN crashes server with multiple foreign key columns
+#   The alter table fails if 2 or more new fields added and
+#   also added a key with these fields
+#
+CREATE TABLE t1 (id int);
+INSERT INTO t1 VALUES (1), (2);
+ALTER TABLE t1 ADD COLUMN (f1 INT), ADD COLUMN (f2 INT), ADD KEY f2k(f2);
+DROP TABLE t1;
+


Attachment: [text/bzr-bundle] bzr/[e-mail]