From f5ff7acb2e11edd78f9ef7545bcf331bd89c30da Mon Sep 17 00:00:00 2001 From: vasil <> Date: Wed, 21 Nov 2007 10:18:22 +0000 Subject: [PATCH] branches/zip: Synchronize the utf8 and ucs2 tests. --- mysql-test/innodb-index.result | 34 ++++++++++++++++++++++++---------- mysql-test/innodb-index.test | 6 ++++-- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/mysql-test/innodb-index.result b/mysql-test/innodb-index.result index 23297e643d0..96e9c45e024 100644 --- a/mysql-test/innodb-index.result +++ b/mysql-test/innodb-index.result @@ -596,6 +596,14 @@ insert into t1 values (1,1,'ab','ab'),(2,2,'ac','ac'),(3,2,'ad','ad'),(4,4,'afe' commit; alter table t1 add unique index (b); ERROR 23000: Duplicate entry '2' for key 'b' +insert into t1 values(8,9,'fff','fff'); +select * from t1; +a b c d +1 1 ab ab +2 2 ac ac +3 2 ad ad +4 4 afe afe +8 9 fff fff show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -606,7 +614,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 alter table t1 add index (b); -insert into t1 values(8,9,'fff','fff'); +insert into t1 values(10,10,'kkk','iii'); select * from t1; a b c d 1 1 ab ab @@ -614,6 +622,7 @@ a b c d 3 2 ad ad 4 4 afe afe 8 9 fff fff +10 10 kkk iii select * from t1 force index(b) order by b; a b c d 1 1 ab ab @@ -621,9 +630,10 @@ a b c d 3 2 ad ad 4 4 afe afe 8 9 fff fff +10 10 kkk iii explain select * from t1 force index(b) order by b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index NULL b 5 NULL 5 +1 SIMPLE t1 index NULL b 5 NULL 6 show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -635,7 +645,7 @@ t1 CREATE TABLE `t1` ( KEY `b` (`b`) ) ENGINE=InnoDB DEFAULT CHARSET=ucs2 alter table t1 add unique index (c), add index (d); -insert into t1 values(10,10,'aaa','kkk'); +insert into t1 values(11,11,'aaa','mmm'); select * from t1; a b c d 1 1 ab ab @@ -643,7 +653,8 @@ a b c d 3 2 ad ad 4 4 afe afe 8 9 fff fff -10 10 aaa kkk +10 10 kkk iii +11 11 aaa mmm select * from t1 force index(b) order by b; a b c d 1 1 ab ab @@ -651,15 +662,17 @@ a b c d 3 2 ad ad 4 4 afe afe 8 9 fff fff -10 10 aaa kkk +10 10 kkk iii +11 11 aaa mmm select * from t1 force index(c) order by c; a b c d -10 10 aaa kkk +11 11 aaa mmm 1 1 ab ab 2 2 ac ac 3 2 ad ad 4 4 afe afe 8 9 fff fff +10 10 kkk iii select * from t1 force index(d) order by d; a b c d 1 1 ab ab @@ -667,16 +680,17 @@ a b c d 3 2 ad ad 4 4 afe afe 8 9 fff fff -10 10 aaa kkk +10 10 kkk iii +11 11 aaa mmm explain select * from t1 force index(b) order by b; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index NULL b 5 NULL 6 +1 SIMPLE t1 index NULL b 5 NULL 7 explain select * from t1 force index(c) order by c; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index NULL c 21 NULL 6 +1 SIMPLE t1 index NULL c 21 NULL 7 explain select * from t1 force index(d) order by d; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index NULL d 43 NULL 6 +1 SIMPLE t1 index NULL d 43 NULL 7 show create table t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/innodb-index.test b/mysql-test/innodb-index.test index 9bf9e1b6a55..dfb8bbc7bbd 100644 --- a/mysql-test/innodb-index.test +++ b/mysql-test/innodb-index.test @@ -190,15 +190,17 @@ insert into t1 values (1,1,'ab','ab'),(2,2,'ac','ac'),(3,2,'ad','ad'),(4,4,'afe' commit; --error ER_DUP_ENTRY alter table t1 add unique index (b); +insert into t1 values(8,9,'fff','fff'); +select * from t1; show create table t1; alter table t1 add index (b); -insert into t1 values(8,9,'fff','fff'); +insert into t1 values(10,10,'kkk','iii'); select * from t1; select * from t1 force index(b) order by b; explain select * from t1 force index(b) order by b; show create table t1; alter table t1 add unique index (c), add index (d); -insert into t1 values(10,10,'aaa','kkk'); +insert into t1 values(11,11,'aaa','mmm'); select * from t1; select * from t1 force index(b) order by b; select * from t1 force index(c) order by c;