13 files changed, 68 insertions, 17 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 60c352e5e52..db1fab7a50d 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -1120,7 +1120,7 @@ run_testcase ()
  slave_opt_file=$TESTDIR/$tname-slave.opt
  master_init_script=$TESTDIR/$tname-master.sh
  slave_init_script=$TESTDIR/$tname-slave.sh
- slave_master_info_file=$TESTDIR/$tname-slave-master-info.opt
+ slave_master_info_file=$TESTDIR/$tname.slave-mi
  echo $tname > $CURRENT_TEST
  SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`
  if [ $USE_MANAGER = 1 ] ; then
diff --git a/mysql-test/r/bigint.result b/mysql-test/r/bigint.result
index 2037085dfdb..e49e39bbbf6 100644
--- a/mysql-test/r/bigint.result
+++ b/mysql-test/r/bigint.result
@@ -8,6 +8,9 @@ select 9223372036854775807,-009223372036854775808;
 select +9999999999999999999,-9999999999999999999;
 +9999999999999999999	-9999999999999999999
 10000000000000000000	-10000000000000000000
+select cast(9223372036854775808 as unsigned)+1;
+cast(9223372036854775808 as unsigned)+1
+9223372036854775809
 select 9223372036854775808+1;
 9223372036854775808+1
 9223372036854775808
diff --git a/mysql-test/r/handler.result b/mysql-test/r/handler.result
index 9d3383efd8f..d8381ccc626 100644
--- a/mysql-test/r/handler.result
+++ b/mysql-test/r/handler.result
@@ -131,7 +131,6 @@ a	b
 handler t2 read next;
 a	b
 18	eee
-alter table t1 type=MyISAM;
 handler t2 read next;
 a	b
 19	fff
@@ -144,4 +143,8 @@ create table t1 (a int);
 insert into t1 values (17);
 handler t2 read first;
 Unknown table 't2' in HANDLER
+handler t1 open as t2;
+alter table t1 type=MyISAM;
+handler t2 read first;
+Unknown table 't2' in HANDLER
 drop table t1;
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 47ed1f99b0e..5bc21501eca 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -1057,6 +1057,12 @@ create table t2 (b varchar(10) not null unique) type=innodb;
 select t1.a from t1,t2 where t1.a=t2.b;
 a
 drop table t1,t2;
+create table t1 (a int not null, b int, primary key (a)) type = innodb;
+create table t2 (a int not null, b int, primary key (a)) type = innodb;
+insert into t1 values (10, 20);
+insert into t2 values (10, 20);
+update t1, t2 set t1.b = 150, t2.b = t1.b where t2.a = t1.a and t1.a = 10;
+drop table t1,t2;
 CREATE TABLE t1 (id INT NOT NULL, PRIMARY KEY (id)) TYPE=INNODB;
 CREATE TABLE t2 (id INT PRIMARY KEY, t1_id INT, INDEX par_ind (t1_id), FOREIGN KEY (t1_id) REFERENCES t1(id)  ON DELETE CASCADE ) TYPE=INNODB;
 insert into t1 set id=1;
diff --git a/mysql-test/r/innodb_handler.result b/mysql-test/r/innodb_handler.result
index dc6a265fb29..4ce104506f1 100644
--- a/mysql-test/r/innodb_handler.result
+++ b/mysql-test/r/innodb_handler.result
@@ -129,11 +129,14 @@ a	b
 handler t2 read next;
 a	b
 18	eee
-alter table t1 type=innodb;
-handler t2 read next;
-a	b
-19	fff
 handler t2 read last;
 You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
 handler t2 close;
+handler t1 open as t2;
+handler t2 read first;
+a	b
+17	ddd
+alter table t1 type=innodb;
+handler t2 read first;
+Unknown table 't2' in HANDLER
 drop table if exists t1;
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index 7114c251e03..30a0cd01c51 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -555,3 +555,14 @@ Table 'test.t1' doesn't exist
 drop table t2;
 select * from t1 where id=2;
 Table 'test.t1' doesn't exist
+create table t1 (word char(20) not null);
+select * from t1;
+word
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	1
+load data infile '../../std_data/words.dat' into table t1;
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	0
+drop table t1;
diff --git a/mysql-test/t/bigint.test b/mysql-test/t/bigint.test
index f627614c049..f583045cea9 100644
--- a/mysql-test/t/bigint.test
+++ b/mysql-test/t/bigint.test
@@ -11,6 +11,13 @@ drop table if exists t1;
 select 0,256,00000000000000065536,2147483647,-2147483648,2147483648,+4294967296;
 select 9223372036854775807,-009223372036854775808;
 select +9999999999999999999,-9999999999999999999;
+select cast(9223372036854775808 as unsigned)+1;
+
+#
+# We need to do a REPLACE here as the atof() function returns different
+# values on True64 and HPUX11
+#
+--replace_result 9223372036854775800 9223372036854775808
 select 9223372036854775808+1;
 #
 # In 3.23 we have to disable the test of column to bigint as
diff --git a/mysql-test/t/handler.test b/mysql-test/t/handler.test
index 657185f5e2d..30746f10c62 100644
--- a/mysql-test/t/handler.test
+++ b/mysql-test/t/handler.test
@@ -65,15 +65,13 @@ handler t2 read a=(19) where b="yyy";
 
 handler t2 read first;
 handler t2 read next;
-alter table t1 type=MyISAM;
 handler t2 read next;
 --error 1064
 handler t2 read last;
-
 handler t2 close;
 
 #
-# DROP TABLE
+# DROP TABLE / ALTER TABLE
 #
 handler t1 open as t2;
 drop table t1;
@@ -81,5 +79,9 @@ create table t1 (a int);
 insert into t1 values (17);
 --error 1109
 handler t2 read first;
+handler t1 open as t2;
+alter table t1 type=MyISAM;
+--error 1109
+handler t2 read first;
 drop table t1;
 
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index 109a34e3068..b8ba55d9230 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -698,6 +698,12 @@ create table t1 (a varchar(10) not null) type=myisam;
 create table t2 (b varchar(10) not null unique) type=innodb;
 select t1.a from t1,t2 where t1.a=t2.b;
 drop table t1,t2;
+create table t1 (a int not null, b int, primary key (a)) type = innodb;
+create table t2 (a int not null, b int, primary key (a)) type = innodb;
+insert into t1 values (10, 20);
+insert into t2 values (10, 20);
+update t1, t2 set t1.b = 150, t2.b = t1.b where t2.a = t1.a and t1.a = 10;
+drop table t1,t2;
 
 #
 # Test of multi-table-delete with foreign key constraints
diff --git a/mysql-test/t/innodb_handler.test b/mysql-test/t/innodb_handler.test
index 49178a6b6b7..32c8741577c 100644
--- a/mysql-test/t/innodb_handler.test
+++ b/mysql-test/t/innodb_handler.test
@@ -65,15 +65,15 @@ handler t2 read a=(19) where b="yyy";
 
 handler t2 read first;
 handler t2 read next;
-#
-# We alter the table even if it's still in use by to test the Innodb
-# delayed-drop code.  This will generate a warning in the master.err log.
-#
-alter table t1 type=innodb;
-handler t2 read next;
 --error 1064
 handler t2 read last;
-
 handler t2 close;
+
+handler t1 open as t2;
+handler t2 read first;
+alter table t1 type=innodb;
+--error 1109
+handler t2 read first;
+
 drop table if exists t1;
 
diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test
index 5f2cf8b5f56..47ea2d06d0a 100644
--- a/mysql-test/t/query_cache.test
+++ b/mysql-test/t/query_cache.test
@@ -388,7 +388,6 @@ select * from mysql.db;
 enable_result_log;
 show status like "Qcache_queries_in_cache";
 
-
 #
 # simple rename test
 #
@@ -401,3 +400,14 @@ select * from t1 where id=2;
 drop table t2;
 -- error 1146
 select * from t1 where id=2;
+
+#
+# Load data invalidation test
+#
+
+create table t1 (word char(20) not null);
+select * from t1;
+show status like "Qcache_queries_in_cache";
+load data infile '../../std_data/words.dat' into table t1;
+show status like "Qcache_queries_in_cache";
+drop table t1;
+\ No newline at end of file
diff --git a/mysql-test/t/rpl000015-slave-master-info.opt b/mysql-test/t/rpl000015.slave-mi
index 28bc753dd56..28bc753dd56 100644
--- a/mysql-test/t/rpl000015-slave-master-info.opt
+++ b/mysql-test/t/rpl000015.slave-mi
diff --git a/mysql-test/t/rpl_rotate_logs-slave-master-info.opt b/mysql-test/t/rpl_rotate_logs.slave-mi
index 80190bf6d29..80190bf6d29 100644
--- a/mysql-test/t/rpl_rotate_logs-slave-master-info.opt
+++ b/mysql-test/t/rpl_rotate_logs.slave-mi