merge with 5.1

8 files changed, 18 insertions, 1 deletions

diff --git a/mysql-test/include/cleanup_fake_relay_log.inc b/mysql-test/include/cleanup_fake_relay_log.inc
index 43aa46cb657..c55e2937242 100644
--- a/mysql-test/include/cleanup_fake_relay_log.inc
+++ b/mysql-test/include/cleanup_fake_relay_log.inc
@@ -9,8 +9,10 @@
 --echo Cleaning up after setup_fake_relay_log.inc
 
 # Remove files.
+--disable_warnings
 remove_file $_fake_relay_log;
 remove_file $_fake_relay_index;
+--enable_warnings
 --disable_query_log
 eval SET @@global.relay_log_purge= $_fake_relay_log_purge;
 --enable_query_log
diff --git a/mysql-test/include/diff_tables.inc b/mysql-test/include/diff_tables.inc
index 81362e8643b..8a463686fdb 100644
--- a/mysql-test/include/diff_tables.inc
+++ b/mysql-test/include/diff_tables.inc
@@ -54,11 +54,12 @@
 
 --echo Comparing tables $diff_table_1 and $diff_table_2
 disable_query_log;
-
+disable_warnings;
 --error 0,1
 --remove_file $MYSQLTEST_VARDIR/tmp/diff_table_1
 --error 0,1
 --remove_file $MYSQLTEST_VARDIR/tmp/diff_table_2
+enable_warnings;
 
 let $_diff_table=$diff_table_2;
 let $_diff_i=2;
diff --git a/mysql-test/include/maria_empty_logs.inc b/mysql-test/include/maria_empty_logs.inc
index 05ecfc4982c..78a08228caa 100644
--- a/mysql-test/include/maria_empty_logs.inc
+++ b/mysql-test/include/maria_empty_logs.inc
@@ -24,6 +24,7 @@ EOF
 
 --source include/mysqladmin_shutdown.inc
 
+--disable_warnings
 if (!$mel_keep_control_file)
 {
   --error 0,1
@@ -73,6 +74,7 @@ remove_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log.00000020;
 
 -- error 0,1
 remove_file $MYSQLD_DATADIR/aria_recovery.trace;
+--enable_warnings
 
 append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
 restart-maria_empty_logs.inc
diff --git a/mysql-test/include/maria_make_snapshot.inc b/mysql-test/include/maria_make_snapshot.inc
index 2f480ac1a45..8f45f6b63a9 100644
--- a/mysql-test/include/maria_make_snapshot.inc
+++ b/mysql-test/include/maria_make_snapshot.inc
@@ -26,12 +26,16 @@ if ($mms_copy)
 if ($mms_reverse_copy)
 {
   # do not call this without flushing target table first!
+  --disable_warnings
   --echo * copied $mms_tname$mms_table_to_use back for $mms_purpose
   -- error 0,1
   remove_file $MYSQLD_DATADIR/mysqltest/$mms_tname$mms_table_to_use.MAD;
+  --enable_warnings
   copy_file $MYSQLD_DATADIR/mysqltest_for_$mms_purpose/$mms_tname$mms_table_to_use.MAD $MYSQLD_DATADIR/mysqltest/$mms_tname$mms_table_to_use.MAD;
+  --disable_warnings
   -- error 0,1
   remove_file $MYSQLD_DATADIR/mysqltest/$mms_tname$mms_table_to_use.MAI;
+  --enable_warnings
   copy_file $MYSQLD_DATADIR/mysqltest_for_$mms_purpose/$mms_tname$mms_table_to_use.MAI $MYSQLD_DATADIR/mysqltest/$mms_tname$mms_table_to_use.MAI;
 }
 
diff --git a/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc b/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
index 6111dacc8f3..dc706174b7c 100644
--- a/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
+++ b/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
@@ -31,8 +31,10 @@ while ($mms_table_to_use)
 let $mms_copy=0;
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
+--disable_warnings
 -- error 0,1
 remove_file $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.aria_log_control;
+--enable_warnings
 copy_file $MYSQLD_DATADIR/$MARIA_LOG/aria_log_control $MYSQLTEST_VARDIR/tmp/mms_for_$mms_purpose.aria_log_control;
 
 connection default;
diff --git a/mysql-test/include/mysqlhotcopy.inc b/mysql-test/include/mysqlhotcopy.inc
index b3fd5e47179..2596994b59a 100644
--- a/mysql-test/include/mysqlhotcopy.inc
+++ b/mysql-test/include/mysqlhotcopy.inc
@@ -75,7 +75,9 @@ USE hotcopy_test;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --list_files $MYSQLTEST_VARDIR/tmp/hotcopy_test
 #--exec rm -rf $MYSQLTEST_VARDIR/tmp/hotcopy_test
+--disable_warnings
 --remove_files_wildcard $MYSQLTEST_VARDIR/tmp/hotcopy_test *
+--enable_warnings
 --rmdir $MYSQLTEST_VARDIR/tmp/hotcopy_test
 
 # backup without full index files
diff --git a/mysql-test/include/ndb_backup.inc b/mysql-test/include/ndb_backup.inc
index 5262f1231a2..eef3bf2bd1e 100644
--- a/mysql-test/include/ndb_backup.inc
+++ b/mysql-test/include/ndb_backup.inc
@@ -18,8 +18,10 @@ CREATE TABLE helper1(c1 VARCHAR(20));
 # dump raw data to file
 let $ndb_backup_file1= $MYSQLTEST_VARDIR/ndb_backup_tmp.dat;
 let $ndb_backup_file2= $MYSQLTEST_VARDIR/tmp.dat;
+--disable_warnings
 --error 0,1
 --remove_file $ndb_backup_file1
+--enable_warnings
 --exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="$NDB_CONNECTSTRING" -d sys --delimiter=',' SYSTAB_0 > $ndb_backup_file1
 # load the table from the raw data file
 eval LOAD DATA INFILE '$ndb_backup_file1' INTO TABLE helper1;
diff --git a/mysql-test/include/ndb_backup_print.inc b/mysql-test/include/ndb_backup_print.inc
index 7527f125686..69faa8f421b 100644
--- a/mysql-test/include/ndb_backup_print.inc
+++ b/mysql-test/include/ndb_backup_print.inc
@@ -1,7 +1,9 @@
 --exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 1 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter > $MYSQLTEST_VARDIR/tmp/tmp.dat
 --exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 2 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter >> $MYSQLTEST_VARDIR/tmp/tmp.dat
 --exec sort $MYSQLTEST_VARDIR/tmp/tmp.dat
+--disable_warnings
 --error 0,1
 --remove_file $MYSQLTEST_VARDIR/tmp/tmp.dat
+--enable_warnings
 --let ndb_restore_opts=
 --let ndb_restore_filter=