1 files changed, 87 insertions, 46 deletions
diff --git a/mysql-test/suite/handler/innodb.result b/mysql-test/suite/handler/innodb.result
index 113d5d7e61f..e9e2fc45837 100644
--- a/mysql-test/suite/handler/innodb.result
+++ b/mysql-test/suite/handler/innodb.result
@@ -4,7 +4,7 @@ create table t1 (a int, b char(10), key a  (a), key b  (a,b));
 insert into t1 values
 (17,"ddd"),(18,"eee"),(19,"fff"),(19,"yyy"),
 (14,"aaa"),(16,"ccc"),(16,"xxx"),
-(20,"ggg"),(21,"hhh"),(22,"iii");
+(20,"ggg"),(21,"hhh"),(22,"iii"),(23,"xxx"),(24,"xxx"),(25,"xxx");
 handler t1 open as t2;
 handler t2 read b first;
 a	b
@@ -20,13 +20,13 @@ a	b
 16	ccc
 handler t2 read b last;
 a	b
-22	iii
+25	xxx
 handler t2 read b prev;
 a	b
-21	hhh
+24	xxx
 handler t2 read b prev;
 a	b
-20	ggg
+23	xxx
 handler t2 read b first;
 a	b
 14	aaa
@@ -34,13 +34,13 @@ handler t2 read b prev;
 a	b
 handler t2 read b last;
 a	b
-22	iii
+25	xxx
 handler t2 read b prev;
 a	b
-21	hhh
+24	xxx
 handler t2 read b next;
 a	b
-22	iii
+25	xxx
 handler t2 read b next;
 a	b
 handler t2 read a=(15);
@@ -105,10 +105,10 @@ handler t2 read a>(54);
 a	b
 handler t2 read a<=(54);
 a	b
-22	iii
+25	xxx
 handler t2 read a<(54);
 a	b
-22	iii
+25	xxx
 handler t2 read a=(1);
 a	b
 handler t2 read a>=(1);
@@ -158,9 +158,9 @@ a	b
 18	eee
 handler t2 read a last  limit 3;
 a	b
-22	iii
-21	hhh
-20	ggg
+25	xxx
+24	xxx
+23	xxx
 handler t2 read b=(16) limit 1,3;
 a	b
 16	xxx
@@ -191,10 +191,10 @@ handler t1 close;
 handler t1 open;
 handler t1 read a prev;
 a	b
-22	iii
+25	xxx
 handler t1 read a prev;
 a	b
-21	hhh
+24	xxx
 handler t1 close;
 handler t1 open as t2;
 handler t2 read first;
@@ -204,53 +204,97 @@ alter table t1 engine = InnoDB;
 handler t2 read first;
 ERROR 42S02: Unknown table 't2' in HANDLER
 handler t1 open;
-handler t1 read a=(16) limit 1,3;
+handler t1 read a=(20) limit 1,3;
 a	b
-16	xxx
 flush tables;
-handler t1 read a=(16) limit 1,3;
+handler t1 read a=(20) limit 1,3;
 a	b
-16	xxx
+handler t1 close;
+handler t1 open;
+handler t1 read a=(25);
+a	b
+25	xxx
+handler t1 read a next;
+a	b
+handler t1 read a next;
+a	b
+handler t1 read a next;
+a	b
+handler t1 read a prev;
+a	b
+25	xxx
+handler t1 read a=(1000);
+a	b
+handler t1 read a next;
+a	b
+handler t1 read a prev;
+a	b
+25	xxx
+handler t1 read a=(1000);
+a	b
+handler t1 read a prev;
+a	b
+25	xxx
+handler t1 read a=(14);
+a	b
+14	aaa
+handler t1 read a prev;
+a	b
+handler t1 read a prev;
+a	b
+handler t1 read a next;
+a	b
+14	aaa
+handler t1 read a=(1);
+a	b
+handler t1 read a prev;
+a	b
+handler t1 read a next;
+a	b
+14	aaa
+handler t1 read a=(1);
+a	b
+handler t1 read a next;
+a	b
+16	ccc
 handler t1 close;
 handler t1 open;
 prepare stmt from 'handler t1 read a=(?) limit ?,?';
-set @a=16,@b=1,@c=100;
+set @a=20,@b=1,@c=100;
 execute stmt using @a,@b,@c;
 a	b
-16	xxx
-set @a=16,@b=2,@c=1;
+set @a=20,@b=2,@c=1;
 execute stmt using @a,@b,@c;
 a	b
-set @a=16,@b=0,@c=2;
+set @a=20,@b=0,@c=2;
 execute stmt using @a,@b,@c;
 a	b
-16	ccc
-16	xxx
+20	ggg
 deallocate prepare stmt;
 prepare stmt from 'handler t1 read a next limit ?';
-handler t1 read a>=(11);
+handler t1 read a>=(21);
 a	b
-14	aaa
+21	hhh
 set @a=3;
 execute stmt using @a;
 a	b
-16	ccc
-16	xxx
-17	ddd
+22	iii
+23	xxx
+24	xxx
 execute stmt using @a;
 a	b
-18	eee
-19	fff
-19	yyy
+25	xxx
 execute stmt using @a;
 a	b
-20	ggg
-21	hhh
-22	iii
 deallocate prepare stmt;
 prepare stmt from 'handler t1 read b prev limit ?';
 execute stmt using @a;
 a	b
+25	xxx
+24	xxx
+23	xxx
+execute stmt using @a;
+a	b
 22	iii
 21	hhh
 20	ggg
@@ -264,9 +308,6 @@ a	b
 17	ddd
 16	xxx
 16	ccc
-execute stmt using @a;
-a	b
-14	aaa
 deallocate prepare stmt;
 prepare stmt from 'handler t1 read b=(?,?)';
 set @a=14, @b='aaa';
@@ -289,27 +330,27 @@ a	b
 16	xxx
 deallocate prepare stmt;
 prepare stmt from 'handler t1 read a>=(?) where a < ? limit 5';
-set @a=15, @b=20;
+set @a=17, @b=24;
 execute stmt using @a,@b;
 a	b
-16	ccc
-16	xxx
 17	ddd
 18	eee
 19	fff
+19	yyy
+20	ggg
 execute stmt using @a,@b;
 a	b
-16	ccc
-16	xxx
 17	ddd
 18	eee
 19	fff
+19	yyy
+20	ggg
 deallocate prepare stmt;
 prepare stmt from 'handler t1 read a=(?)';
-set @a=16;
+set @a=17;
 execute stmt using @a;
 a	b
-16	ccc
+17	ddd
 alter table t1 add c int;
 execute stmt using @a;
 ERROR 42S02: Unknown table 't1' in HANDLER
@@ -319,7 +360,7 @@ ERROR 42S02: Unknown table 't1' in HANDLER
 handler t1 open;
 prepare stmt from 'handler t1 read a=(?)';
 flush tables;
-set @a=16;
+set @a=17;
 execute stmt using @a;
 ERROR HY000: Prepared statement needs to be re-prepared
 deallocate prepare stmt;