diff --git a/mysql-test/patches/innodb-index.diff b/mysql-test/patches/innodb-index.diff index 6cc8a989499..0b008c96f25 100644 --- a/mysql-test/patches/innodb-index.diff +++ b/mysql-test/patches/innodb-index.diff @@ -11,7 +11,7 @@ in the MySQL source repository. Index: storage/innobase/mysql-test/innodb-index.result =================================================================== ---- storage/innobase/mysql-test/innodb-index.result (revision 2229) +--- storage/innobase/mysql-test/innodb-index.result (revision 2870) +++ storage/innobase/mysql-test/innodb-index.result (working copy) @@ -43,19 +43,12 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, @@ -35,7 +35,7 @@ Index: storage/innobase/mysql-test/innodb-index.result `b` int(11) DEFAULT NULL, Index: storage/innobase/mysql-test/innodb-index.test =================================================================== ---- storage/innobase/mysql-test/innodb-index.test (revision 2229) +--- storage/innobase/mysql-test/innodb-index.test (revision 2870) +++ storage/innobase/mysql-test/innodb-index.test (working copy) @@ -14,22 +14,12 @@ select * from t1 force index (d2) order --error ER_DUP_ENTRY @@ -57,6 +57,6 @@ Index: storage/innobase/mysql-test/innodb-index.test alter table t1 add unique index (c), add index (d); show create table t1; explain select * from t1 force index(c) order by c; - --error ER_REQUIRES_PRIMARY_KEY - drop index c on t1; alter table t1 add primary key (a), drop index c; + show create table t1; + --error ER_MULTIPLE_PRI_KEY