Fix problem where key_read was not cleaned up properly, which caused assert in innodb test.

mysql-test/r/innodb.result:
  Changed tests to make them repeatable.
mysql-test/t/innodb.test:
  Changed tests to make them repeatable.
sql/opt_sum.cc:
  Safety fix
sql/sql_base.cc:
  Safety assert

2 files changed, 25 insertions, 13 deletions

diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 3f28f00f322..f954928befc 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -1139,7 +1139,7 @@ a	b
 drop table t1;
 CREATE TABLE t1 (a int not null primary key, b int not null, key (b)) type=innodb;
 CREATE TABLE t2 (a int not null primary key, b int not null, key (b)) type=innodb;
-INSERT INTO t1 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9);
+INSERT INTO t1 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9),(10,10),(11,11),(12,12);
 INSERT INTO t2 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9);
 update t1,t2 set t1.a=t1.a+100;
 select * from t1;
@@ -1153,6 +1153,9 @@ a	b
 107	7
 108	8
 109	9
+110	10
+111	11
+112	12
 update t1,t2 set t1.a=t1.a+100 where t1.a=101;
 select * from t1;
 a	b
@@ -1165,6 +1168,9 @@ a	b
 107	7
 108	8
 109	9
+110	10
+111	11
+112	12
 update t1,t2 set t1.b=t1.b+10 where t1.b=2;
 select * from t1;
 a	b
@@ -1176,8 +1182,11 @@ a	b
 107	7
 108	8
 109	9
+110	10
+111	11
 102	12
-update t1,t2 set t1.b=t1.b+2,t2.b=t1.b where t1.b between 3 and 5;
+112	12
+update t1,t2 set t1.b=t1.b+2,t2.b=t1.b+10 where t1.b between 3 and 5 and t1.a=t2.a+100;
 select * from t1;
 a	b
 201	1
@@ -1188,18 +1197,21 @@ a	b
 107	7
 108	8
 109	9
+110	10
+111	11
 102	12
+112	12
 select * from t2;
 a	b
-1	5
-2	5
-3	5
-4	5
-5	5
-6	5
-7	5
-8	5
-9	5
+1	1
+2	2
+6	6
+7	7
+8	8
+9	9
+3	13
+4	14
+5	15
 drop table t1,t2;
 create table t1 (a int not null auto_increment primary key, b int, c int, key(c)) type=innodb;
 create table t2 (a int not null auto_increment primary key, b int);
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index ab3157a7f86..8aa26b567a6 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -776,7 +776,7 @@ drop table t1;
 
 CREATE TABLE t1 (a int not null primary key, b int not null, key (b)) type=innodb;
 CREATE TABLE t2 (a int not null primary key, b int not null, key (b)) type=innodb;
-INSERT INTO t1 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9);
+INSERT INTO t1 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9),(10,10),(11,11),(12,12);
 INSERT INTO t2 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9);
 
 # Full join, without key
@@ -792,7 +792,7 @@ update t1,t2 set t1.b=t1.b+10 where t1.b=2;
 select * from t1;
 
 # Range key (in t1)
-update t1,t2 set t1.b=t1.b+2,t2.b=t1.b where t1.b between 3 and 5;
+update t1,t2 set t1.b=t1.b+2,t2.b=t1.b+10 where t1.b between 3 and 5 and t1.a=t2.a+100;
 select * from t1;
 select * from t2;
 drop table t1,t2;