diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_group.result | 8 | ||||
| -rw-r--r-- | mysql-test/r/group_by.result | 18 | ||||
| -rw-r--r-- | mysql-test/r/rpl_insert_id.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/rpl_master_pos_wait.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/rpl000009.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_insert_id.test | 6 | ||||
| -rw-r--r-- | mysql-test/t/subselect.test | 3 |
7 files changed, 25 insertions, 22 deletions
diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result index b13dfa4de7a..ba48808a319 100644 --- a/mysql-test/r/func_group.result +++ b/mysql-test/r/func_group.result @@ -173,11 +173,11 @@ select max(t2.a2), max(t1.a1) from t1, t2; max(t2.a2) max(t1.a1) NULL NULL explain select min(a2) from t1; -Comment -Select tables optimized away +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Select tables optimized away explain select max(t1.a1), max(t2.a2) from t1, t2; -Comment -No matching min/max row +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No matching min/max row insert into t2 values('AAA', 10, 0.5); select max(t1.a1), max(t2.a1) from t1, t2 where t2.a2=9; max(t1.a1) max(t2.a1) diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index 40e2c72ff32..e6f3256d779 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -266,10 +266,10 @@ userid count(*) explain select spid,count(*) from t1 where spid between 1 and 2 group by spid desc; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range spID spID 5 NULL 2 Using where; Using index -explain select spid,count(*) from t1 where spid between 1 and 2 group by spid order by null; +explain select spid,count(*) from t1 where spid between 1 and 2 group by spid; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range spID spID 5 NULL 2 Using where; Using index -explain select spid,count(*) from t1 where spid between 1 and 2 group by spid; +explain select spid,count(*) from t1 where spid between 1 and 2 group by spid order by null; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range spID spID 5 NULL 2 Using where; Using index select spid,count(*) from t1 where spid between 1 and 2 group by spid; @@ -285,7 +285,7 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 6 Using filesort explain select sql_big_result spid,sum(userid) from t1 group by spid desc order by null; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 6 +1 SIMPLE t1 ALL NULL NULL NULL NULL 6 select sql_big_result spid,sum(userid) from t1 group by spid desc; spid sum(userid) 5 3 @@ -522,13 +522,13 @@ a b 2 2 1 1 explain select t1.a,t2.b from t1,t2 where t1.a=t2.a group by t1.a,t2.b; -table type possible_keys key key_len ref rows Extra -t1 ALL NULL NULL NULL NULL 6 Using temporary; Using filesort -t2 ALL a NULL NULL NULL 4 Using where +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 6 Using temporary; Using filesort +1 SIMPLE t2 ALL a NULL NULL NULL 4 Using where explain select t1.a,t2.b from t1,t2 where t1.a=t2.a group by t1.a,t2.b ORDER BY NULL; -table type possible_keys key key_len ref rows Extra -t1 ALL NULL NULL NULL NULL 6 Using temporary -t2 ALL a NULL NULL NULL 4 Using where +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 6 Using temporary +1 SIMPLE t2 ALL a NULL NULL NULL 4 Using where drop table t1,t2; create table t1 (a int, b int); insert into t1 values (1, 4); diff --git a/mysql-test/r/rpl_insert_id.result b/mysql-test/r/rpl_insert_id.result index d524818985e..45e0186ac4d 100644 --- a/mysql-test/r/rpl_insert_id.result +++ b/mysql-test/r/rpl_insert_id.result @@ -1,10 +1,12 @@ -slave stop; +stop slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -slave start; +start slave; drop table if exists t1; +Warnings: +Note 1051 Unknown table 't1' create table t1(a int auto_increment, key(a)); create table t2(b int auto_increment, c int, key(b)); insert into t1 values (1),(2),(3); diff --git a/mysql-test/r/rpl_master_pos_wait.result b/mysql-test/r/rpl_master_pos_wait.result index 22c7aef621c..801ffad6975 100644 --- a/mysql-test/r/rpl_master_pos_wait.result +++ b/mysql-test/r/rpl_master_pos_wait.result @@ -1,9 +1,9 @@ -slave stop; +stop slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -slave start; +start slave; select master_pos_wait('master-bin.999999',0,10); master_pos_wait('master-bin.999999',0,10) -1 diff --git a/mysql-test/t/rpl000009.test b/mysql-test/t/rpl000009.test index 1fbdd65e1fb..e349d891415 100644 --- a/mysql-test/t/rpl000009.test +++ b/mysql-test/t/rpl000009.test @@ -12,7 +12,7 @@ create database mysqltest; save_master_pos; connection slave; sync_with_master; -create database mysqltest; +create database mysqltest2; create table mysqltest2.foo (n int); insert into mysqltest2.foo values(4); connection master; diff --git a/mysql-test/t/rpl_insert_id.test b/mysql-test/t/rpl_insert_id.test index 3f3636d3082..93062f39c20 100644 --- a/mysql-test/t/rpl_insert_id.test +++ b/mysql-test/t/rpl_insert_id.test @@ -1,9 +1,7 @@ -#see if queries that use both -#auto_increment and LAST_INSERT_ID() -#are replicated well +# See if queries that use both auto_increment and LAST_INSERT_ID() +# are replicated well source include/master-slave.inc; connection master; -drop table if exists t1; create table t1(a int auto_increment, key(a)); create table t2(b int auto_increment, c int, key(b)); insert into t1 values (1),(2),(3); diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index 03575858c3e..bb872df3e5c 100644 --- a/mysql-test/t/subselect.test +++ b/mysql-test/t/subselect.test @@ -91,7 +91,10 @@ select * from t3 where a in (select b from t2); select * from t3 where a not in (select b from t2); select * from t3 where a = some (select b from t2); select * from t3 where a <> any (select b from t2); + +# Rewrite: select * from t3 where not exists (select b from t2 where a <> b); select * from t3 where a = all (select b from t2); + select * from t3 where a <> all (select b from t2); insert into t2 values (100, 5); select * from t3 where a < any (select b from t2); |