diff options
Diffstat (limited to 'mysql-test/suite/heap')
| -rw-r--r-- | mysql-test/suite/heap/heap.result | 23 | ||||
| -rw-r--r-- | mysql-test/suite/heap/heap.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/heap/heap_btree.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/heap/heap_btree.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/heap/heap_hash.result | 9 | ||||
| -rw-r--r-- | mysql-test/suite/heap/heap_hash.test | 4 |
6 files changed, 20 insertions, 20 deletions
diff --git a/mysql-test/suite/heap/heap.result b/mysql-test/suite/heap/heap.result index 158dd225bc0..6bd0582a384 100644 --- a/mysql-test/suite/heap/heap.result +++ b/mysql-test/suite/heap/heap.result @@ -66,7 +66,7 @@ a alter table t1 engine=myisam; explain select * from t1 where a in (869751,736494,226312,802616); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range uniq_id uniq_id 4 NULL 4 Using where; Using index +1 SIMPLE t1 index uniq_id uniq_id 4 NULL 5 Using where; Using index drop table t1; create table t1 (x int not null, y int not null, key x (x), unique y (y)) engine=heap; @@ -563,32 +563,32 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MEMORY DEFAULT CHARSET=latin1 select count(*) from t1; count(*) -270 +267 insert into t1 values(concat('a',char(1)),concat('a',char(1)),concat('a',char(1))); select count(*) from t1 where v='a'; count(*) -10 +7 select count(*) from t1 where c='a'; count(*) -10 +7 select count(*) from t1 where t='a'; count(*) -10 +7 select count(*) from t1 where v='a '; count(*) -10 +7 select count(*) from t1 where c='a '; count(*) -10 +7 select count(*) from t1 where t='a '; count(*) -10 +7 select count(*) from t1 where v between 'a' and 'a '; count(*) -10 +7 select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' and 'b\n'; count(*) -10 +7 explain select count(*) from t1 where v='a '; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ref v v 13 const # Using where @@ -618,9 +618,6 @@ qq *a *a*a * *a *a*a * *a *a*a * -*a *a*a * -*a *a*a * -*a *a*a * explain select * from t1 where v='a'; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ref v v 13 const # Using where diff --git a/mysql-test/suite/heap/heap.test b/mysql-test/suite/heap/heap.test index ea07d020e4d..237685a6423 100644 --- a/mysql-test/suite/heap/heap.test +++ b/mysql-test/suite/heap/heap.test @@ -337,6 +337,7 @@ while ($1) } dec $1; } +delete from t1 where v like 'a%' and length(v) > 7; commit; --enable_query_log select count(*) from t1; diff --git a/mysql-test/suite/heap/heap_btree.result b/mysql-test/suite/heap/heap_btree.result index 83d1bcb6c92..8c1c8217b6a 100644 --- a/mysql-test/suite/heap/heap_btree.result +++ b/mysql-test/suite/heap/heap_btree.result @@ -66,7 +66,7 @@ a alter table t1 engine=myisam; explain select * from t1 where a in (869751,736494,226312,802616); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range uniq_id uniq_id 4 NULL 4 Using where; Using index +1 SIMPLE t1 index uniq_id uniq_id 4 NULL 5 Using where; Using index drop table t1; create table t1 (x int not null, y int not null, key x using BTREE (x,y), unique y using BTREE (y)) engine=heap; diff --git a/mysql-test/suite/heap/heap_btree.test b/mysql-test/suite/heap/heap_btree.test index aca41c430b3..6e087c7ef24 100644 --- a/mysql-test/suite/heap/heap_btree.test +++ b/mysql-test/suite/heap/heap_btree.test @@ -37,6 +37,7 @@ create table t1 (a int not null) engine=heap; insert into t1 values (869751),(736494),(226312),(802616),(728912); select * from t1 where a > 736494; alter table t1 add unique uniq_id using BTREE (a); +--sorted_result select * from t1 where a > 736494; select * from t1 where a = 736494; select * from t1 where a=869751 or a=736494; diff --git a/mysql-test/suite/heap/heap_hash.result b/mysql-test/suite/heap/heap_hash.result index 55d43588403..df1acdae506 100644 --- a/mysql-test/suite/heap/heap_hash.result +++ b/mysql-test/suite/heap/heap_hash.result @@ -66,7 +66,7 @@ a alter table t1 engine=myisam; explain select * from t1 where a in (869751,736494,226312,802616); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range uniq_id uniq_id 4 NULL 4 Using where; Using index +1 SIMPLE t1 ALL uniq_id NULL NULL NULL 5 Using where drop table t1; create table t1 (x int not null, y int not null, key x using HASH (x), unique y using HASH (y)) engine=heap; @@ -426,15 +426,16 @@ select 0+a from t1 where a=869751 or a=736494; explain select 0+a from t1 where a=869751 or a=736494; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range uniq_id uniq_id 8 NULL 2 Using where -select 0+a from t1 where a in (869751,736494,226312,802616); +select 0+a from t1 where a in (869751,736494,226312,802616,728912); 0+a 226312 +728912 736494 802616 869751 -explain select 0+a from t1 where a in (869751,736494,226312,802616); +explain select 0+a from t1 where a in (869751,736494,226312,802616,728912); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range uniq_id uniq_id 8 NULL 4 Using where +1 SIMPLE t1 range uniq_id uniq_id 8 NULL 5 Using where drop table t1; End of 5.3 tests # diff --git a/mysql-test/suite/heap/heap_hash.test b/mysql-test/suite/heap/heap_hash.test index 3fe95e14205..3a8979a2393 100644 --- a/mysql-test/suite/heap/heap_hash.test +++ b/mysql-test/suite/heap/heap_hash.test @@ -313,8 +313,8 @@ select 0+a from t1 where a = 736494; explain select 0+a from t1 where a = 736494; select 0+a from t1 where a=869751 or a=736494; explain select 0+a from t1 where a=869751 or a=736494; -select 0+a from t1 where a in (869751,736494,226312,802616); -explain select 0+a from t1 where a in (869751,736494,226312,802616); +select 0+a from t1 where a in (869751,736494,226312,802616,728912); +explain select 0+a from t1 where a in (869751,736494,226312,802616,728912); drop table t1; --echo End of 5.3 tests |