From bda130e6b3ddc45218e4ed1b81cb03a213e5e00c Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Thu, 13 Jan 2011 02:59:11 +0200 Subject: Updated test results for 5.3 Changed handler.inc to make test row order independent mysql-test/r/table_elim.result: Updated test results for 5.3 mysql-test/suite/handler/aria.result: Updated result mysql-test/suite/handler/handler.inc: Changed handler.inc to make test row order independent mysql-test/suite/handler/heap.result: Updated result mysql-test/suite/handler/innodb.result: Updated result mysql-test/suite/handler/myisam.result: Updated result --- mysql-test/r/table_elim.result | 6 +++--- mysql-test/suite/handler/aria.result | 22 ++++++++++++---------- mysql-test/suite/handler/handler.inc | 18 +++++++++--------- mysql-test/suite/handler/heap.result | 22 ++++++++++++---------- mysql-test/suite/handler/innodb.result | 22 ++++++++++++---------- mysql-test/suite/handler/myisam.result | 22 ++++++++++++---------- 6 files changed, 60 insertions(+), 52 deletions(-) diff --git a/mysql-test/r/table_elim.result b/mysql-test/r/table_elim.result index 19567770042..06135e28efb 100644 --- a/mysql-test/r/table_elim.result +++ b/mysql-test/r/table_elim.result @@ -560,9 +560,9 @@ JOIN t5 ON t4.f3 ON t3.f1 = t5.f5 ON t2.f4 = t3.f4 WHERE t3.f2 ; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t3 ALL NULL NULL NULL NULL 2 Using where -1 SIMPLE t5 ref f5 f5 5 test.t3.f1 2 Using index -1 SIMPLE t4 ALL NULL NULL NULL NULL 3 -1 SIMPLE t2 ALL f4 NULL NULL NULL 11 Using where; Using join buffer +1 SIMPLE t5 ref f5 f5 5 test.t3.f1 2 Using where; Using index +1 SIMPLE t4 ALL NULL NULL NULL NULL 3 Using where +1 SIMPLE t2 ALL f4 NULL NULL NULL 11 Using where; Using join buffer (flat, BNL join) # ^^ The above must not produce a QEP of t3,t5,t2,t4 # as that violates the "no interleaving of outer join nests" rule. DROP TABLE t1,t2,t3,t4,t5; diff --git a/mysql-test/suite/handler/aria.result b/mysql-test/suite/handler/aria.result index df0b53a298a..58ecdaa1f09 100644 --- a/mysql-test/suite/handler/aria.result +++ b/mysql-test/suite/handler/aria.result @@ -45,9 +45,9 @@ handler t2 read b next; a b handler t2 read a=(15); a b -handler t2 read a=(16); +handler t2 read a=(21); a b -16 ccc +21 hhh handler t2 read a=(19,"fff"); ERROR 42000: Too many key parts specified; max 1 parts allowed handler t2 read b=(19,"fff"); @@ -83,12 +83,14 @@ a b 17 ddd handler t2 read a=(15); a b -handler t2 read a>=(15); +handler t2 read a>=(15) limit 2; a b 16 ccc -handler t2 read a>(15); +16 xxx +handler t2 read a>(15) limit 2; a b 16 ccc +16 xxx handler t2 read a<=(15); a b 14 aaa @@ -140,17 +142,17 @@ a b 16 xxx 16 ccc 14 aaa -handler t2 read a>=(16) limit 4; +handler t2 read b>=(16) limit 4; a b 16 ccc 16 xxx 17 ddd 18 eee -handler t2 read a>=(16) limit 2,2; +handler t2 read b>=(16) limit 2,2; a b 17 ddd 18 eee -select * from t1 where a>=16 limit 2,2; +select * from t1 where a>=16 order by a,b limit 2,2; a b 17 ddd 18 eee @@ -159,7 +161,7 @@ a b 22 iii 21 hhh 20 ggg -handler t2 read a=(16) limit 1,3; +handler t2 read b=(16) limit 1,3; a b 16 xxx handler t2 read b=(19); @@ -179,10 +181,10 @@ a b 19 fff handler t2 close; handler t1 open; -handler t1 read a next; +handler t1 read b next; a b 14 aaa -handler t1 read a next; +handler t1 read b next; a b 16 ccc handler t1 close; diff --git a/mysql-test/suite/handler/handler.inc b/mysql-test/suite/handler/handler.inc index 0d5f1a1e546..d0ae6164079 100644 --- a/mysql-test/suite/handler/handler.inc +++ b/mysql-test/suite/handler/handler.inc @@ -40,7 +40,7 @@ handler t2 read b next; handler t2 read b next; handler t2 read a=(15); -handler t2 read a=(16); +handler t2 read a=(21); --error 1070 handler t2 read a=(19,"fff"); @@ -66,9 +66,9 @@ handler t2 read b<(18); --sorted_result handler t2 read a=(15); --sorted_result -handler t2 read a>=(15); +handler t2 read a>=(15) limit 2; --sorted_result -handler t2 read a>(15); +handler t2 read a>(15) limit 2; handler t2 read a<=(15); handler t2 read a<(15); @@ -90,11 +90,11 @@ handler t2 read b first limit 5; handler t2 read b next limit 3; handler t2 read b prev limit 10; -handler t2 read a>=(16) limit 4; -handler t2 read a>=(16) limit 2,2; -select * from t1 where a>=16 limit 2,2; +handler t2 read b>=(16) limit 4; +handler t2 read b>=(16) limit 2,2; +select * from t1 where a>=16 order by a,b limit 2,2; handler t2 read a last limit 3; -handler t2 read a=(16) limit 1,3; +handler t2 read b=(16) limit 1,3; handler t2 read b=(19); handler t2 read b=(19) where b="yyy"; @@ -104,8 +104,8 @@ handler t2 read next; handler t2 close; handler t1 open; -handler t1 read a next; # this used to crash as a bug#5373 -handler t1 read a next; +handler t1 read b next; # this used to crash as a bug#5373 +handler t1 read b next; handler t1 close; handler t1 open; diff --git a/mysql-test/suite/handler/heap.result b/mysql-test/suite/handler/heap.result index 8f4a410e793..27d3f05b14e 100644 --- a/mysql-test/suite/handler/heap.result +++ b/mysql-test/suite/handler/heap.result @@ -45,9 +45,9 @@ handler t2 read b next; a b handler t2 read a=(15); a b -handler t2 read a=(16); +handler t2 read a=(21); a b -16 ccc +21 hhh handler t2 read a=(19,"fff"); ERROR 42000: Too many key parts specified; max 1 parts allowed handler t2 read b=(19,"fff"); @@ -83,12 +83,14 @@ a b 17 ddd handler t2 read a=(15); a b -handler t2 read a>=(15); +handler t2 read a>=(15) limit 2; a b 16 ccc -handler t2 read a>(15); +16 xxx +handler t2 read a>(15) limit 2; a b 16 ccc +16 xxx handler t2 read a<=(15); a b 14 aaa @@ -140,17 +142,17 @@ a b 16 xxx 16 ccc 14 aaa -handler t2 read a>=(16) limit 4; +handler t2 read b>=(16) limit 4; a b 16 ccc 16 xxx 17 ddd 18 eee -handler t2 read a>=(16) limit 2,2; +handler t2 read b>=(16) limit 2,2; a b 17 ddd 18 eee -select * from t1 where a>=16 limit 2,2; +select * from t1 where a>=16 order by a,b limit 2,2; a b 17 ddd 18 eee @@ -159,7 +161,7 @@ a b 22 iii 21 hhh 20 ggg -handler t2 read a=(16) limit 1,3; +handler t2 read b=(16) limit 1,3; a b 16 xxx handler t2 read b=(19); @@ -179,10 +181,10 @@ a b 19 fff handler t2 close; handler t1 open; -handler t1 read a next; +handler t1 read b next; a b 14 aaa -handler t1 read a next; +handler t1 read b next; a b 16 ccc handler t1 close; diff --git a/mysql-test/suite/handler/innodb.result b/mysql-test/suite/handler/innodb.result index 9d3bbb2ddfe..113d5d7e61f 100644 --- a/mysql-test/suite/handler/innodb.result +++ b/mysql-test/suite/handler/innodb.result @@ -45,9 +45,9 @@ handler t2 read b next; a b handler t2 read a=(15); a b -handler t2 read a=(16); +handler t2 read a=(21); a b -16 ccc +21 hhh handler t2 read a=(19,"fff"); ERROR 42000: Too many key parts specified; max 1 parts allowed handler t2 read b=(19,"fff"); @@ -83,12 +83,14 @@ a b 17 ddd handler t2 read a=(15); a b -handler t2 read a>=(15); +handler t2 read a>=(15) limit 2; a b 16 ccc -handler t2 read a>(15); +16 xxx +handler t2 read a>(15) limit 2; a b 16 ccc +16 xxx handler t2 read a<=(15); a b 14 aaa @@ -140,17 +142,17 @@ a b 16 xxx 16 ccc 14 aaa -handler t2 read a>=(16) limit 4; +handler t2 read b>=(16) limit 4; a b 16 ccc 16 xxx 17 ddd 18 eee -handler t2 read a>=(16) limit 2,2; +handler t2 read b>=(16) limit 2,2; a b 17 ddd 18 eee -select * from t1 where a>=16 limit 2,2; +select * from t1 where a>=16 order by a,b limit 2,2; a b 17 ddd 18 eee @@ -159,7 +161,7 @@ a b 22 iii 21 hhh 20 ggg -handler t2 read a=(16) limit 1,3; +handler t2 read b=(16) limit 1,3; a b 16 xxx handler t2 read b=(19); @@ -179,10 +181,10 @@ a b 19 fff handler t2 close; handler t1 open; -handler t1 read a next; +handler t1 read b next; a b 14 aaa -handler t1 read a next; +handler t1 read b next; a b 16 ccc handler t1 close; diff --git a/mysql-test/suite/handler/myisam.result b/mysql-test/suite/handler/myisam.result index b936bbc23ff..fd333015bbe 100644 --- a/mysql-test/suite/handler/myisam.result +++ b/mysql-test/suite/handler/myisam.result @@ -45,9 +45,9 @@ handler t2 read b next; a b handler t2 read a=(15); a b -handler t2 read a=(16); +handler t2 read a=(21); a b -16 ccc +21 hhh handler t2 read a=(19,"fff"); ERROR 42000: Too many key parts specified; max 1 parts allowed handler t2 read b=(19,"fff"); @@ -83,12 +83,14 @@ a b 17 ddd handler t2 read a=(15); a b -handler t2 read a>=(15); +handler t2 read a>=(15) limit 2; a b 16 ccc -handler t2 read a>(15); +16 xxx +handler t2 read a>(15) limit 2; a b 16 ccc +16 xxx handler t2 read a<=(15); a b 14 aaa @@ -140,17 +142,17 @@ a b 16 xxx 16 ccc 14 aaa -handler t2 read a>=(16) limit 4; +handler t2 read b>=(16) limit 4; a b 16 ccc 16 xxx 17 ddd 18 eee -handler t2 read a>=(16) limit 2,2; +handler t2 read b>=(16) limit 2,2; a b 17 ddd 18 eee -select * from t1 where a>=16 limit 2,2; +select * from t1 where a>=16 order by a,b limit 2,2; a b 17 ddd 18 eee @@ -159,7 +161,7 @@ a b 22 iii 21 hhh 20 ggg -handler t2 read a=(16) limit 1,3; +handler t2 read b=(16) limit 1,3; a b 16 xxx handler t2 read b=(19); @@ -179,10 +181,10 @@ a b 19 fff handler t2 close; handler t1 open; -handler t1 read a next; +handler t1 read b next; a b 14 aaa -handler t1 read a next; +handler t1 read b next; a b 16 ccc handler t1 close; -- cgit v1.2.1