diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-08-04 10:39:53 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-08-04 10:39:53 +0200 |
| commit | 3f1c763a94cd25c4810692983f6e61b528e21268 (patch) | |
| tree | d8f9632933303f9bdf8cdc875613ca99f51ecbcb /mysql-test/r/innodb.result | |
| parent | a74d04671d23fa65bd610184965cc2974ec41cf9 (diff) | |
| parent | 0c6afe17dceb926b5c757157308188e540caec1e (diff) | |
| download | mariadb-git-3f1c763a94cd25c4810692983f6e61b528e21268.tar.gz | |
Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.
Diffstat (limited to 'mysql-test/r/innodb.result')
| -rw-r--r-- | mysql-test/r/innodb.result | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 9cfa825447b..718e363adb7 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -691,14 +691,16 @@ count(*) select count(*) from t1 where sca_pic is null; count(*) 2 -alter table t1 drop index sca_pic, add index sca_pic (cat_code, sca_pic); +alter table t1 drop index sca_pic; +alter table t1 add index sca_pic (cat_code, sca_pic); select count(*) from t1 where sca_code='PD' and sca_pic is null; count(*) 1 select count(*) from t1 where cat_code='E'; count(*) 0 -alter table t1 drop index sca_pic, add index (sca_pic, cat_code); +alter table t1 drop index sca_pic; +alter table t1 add index (sca_pic, cat_code); select count(*) from t1 where sca_code='PD' and sca_pic is null; count(*) 1 @@ -1508,7 +1510,7 @@ t2 CREATE TABLE `t2` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 drop index id2 on t2; drop index id on t2; -Got one of the listed errors +ERROR HY000: Cannot drop index 'id': needed in a foreign key constraint show create table t2; Table Create Table t2 CREATE TABLE `t2` ( |