7 files changed, 36 insertions, 11 deletions
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