database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

branches/zip:

Browse Source 
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
This commit is contained in:
vasil
2008-10-24 09:48:38 +00:00
parent 6138451863
commit dc390f9c7b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/patches/innodb-index.diff
View File

@ -11,7 +11,7 @@ in the MySQL source repository.
Index: storage/innobase/mysql-test/innodb-index.result 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) +++ storage/innobase/mysql-test/innodb-index.result (working copy)
@@ -43,19 +43,12 @@ t1 CREATE TABLE `t1` ( @@ -43,19 +43,12 @@ t1 CREATE TABLE `t1` (
`b` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL,
@ -35,7 +35,7 @@ Index: storage/innobase/mysql-test/innodb-index.result
`b` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL,
Index: storage/innobase/mysql-test/innodb-index.test 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) +++ storage/innobase/mysql-test/innodb-index.test (working copy)
@@ -14,22 +14,12 @@ select * from t1 force index (d2) order @@ -14,22 +14,12 @@ select * from t1 force index (d2) order
--error ER_DUP_ENTRY --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); alter table t1 add unique index (c), add index (d);
show create table t1; show create table t1;
explain select * from t1 force index(c) order by c; 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; alter table t1 add primary key (a), drop index c;
show create table t1;
--error ER_MULTIPLE_PRI_KEY