auto-merge

mysql-test/t/change_user.test

@@ -63,8 +63,14 @@ while ($i)
 --enable_query_log
 --enable_result_log
 
-SHOW GLOBAL STATUS LIKE 'com_select';
+let $before= query_get_value(SHOW GLOBAL STATUS LIKE 'com_select',Value,1);
 
 --change_user
 
-SHOW GLOBAL STATUS LIKE 'com_select';
+let $after= query_get_value(SHOW GLOBAL STATUS LIKE 'com_select',Value,1);
+
+if (`select $after != $before`){
+  SHOW GLOBAL STATUS LIKE 'com_select';
+  die The value of com_select changed during change_user;
+}
+echo Value of com_select did not change;

mysql-test/t/func_compress.test

@@ -49,6 +49,9 @@ set @@global.max_allowed_packet=1048576*100;
 # reconnect to make the new max packet size take effect
 --connect (newconn, localhost, root,,)
 eval select compress(repeat('aaaaaaaaaa', IF('$LOW_MEMORY', 10, 10000000))) is null;
+disconnect newconn;
+connection default;
+set @@global.max_allowed_packet=default;
 
 #
 # Bug #18643: problem with null values

mysql-test/t/init_file.test

@@ -13,7 +13,8 @@ INSERT INTO init_file.startup VALUES ( NOW() );
 SELECT * INTO @X FROM init_file.startup limit 0,1;
 SELECT * INTO @Y FROM init_file.startup limit 1,1;
 SELECT YEAR(@X)-YEAR(@Y);
-DROP DATABASE init_file;
+# Enable this DROP DATABASE only after resolving bug #42507
+# DROP DATABASE init_file;
 
 --echo ok
 --echo end of 4.1 tests
@@ -26,4 +27,5 @@ select * from t1;
 # Expected:
 #   30, 3, 11, 13
 select * from t2;
-drop table t1, t2;
+# Enable this DROP TABLE only after resolving bug #42507
+#drop table t1, t2;

mysql-test/t/innodb_bug34300.test

@@ -21,6 +21,7 @@ CREATE TABLE bug34300 (
 
 INSERT INTO bug34300 VALUES ('xxx', repeat('a', 8459264), 'zzz');
 
+-- enable_query_log
 -- enable_result_log
 
 SELECT f4, f8 FROM bug34300;
@@ -30,3 +31,7 @@ ALTER TABLE bug34300 ADD COLUMN (f10 INT);
 SELECT f4, f8 FROM bug34300;
 
 DROP TABLE bug34300;
+
+disconnect newconn;
+connection default;
+SET @@global.max_allowed_packet=default;

mysql-test/t/not_embedded_server.test

@@ -4,6 +4,11 @@
 
 -- source include/not_embedded.inc
 
+#
+# Produce output
+#
+
+select 1;
 
 # The following fails sporadically because 'check-testcase' runs
 # queries before this test and there is no way to guarantee that any
@@ -31,5 +36,4 @@
 #execute stmt1;
 #deallocate prepare stmt1;
 
-
 # End of 5.1 tests

mysql-test/t/system_mysql_db_fix30020.test

@@ -104,4 +104,5 @@ time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index;
 # check that we dropped all system tables
 show tables;
 
+exit;
 # End of 4.1 tests