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

5 files changed, 57 insertions, 49 deletions

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;