#At file:///D:/source/bzr/mysql-6.0-review/
2734 Chuck Bell 2008-11-14
BUG#40748 : Backup tests not terminating debug_sync correctly
Tests that do not include the reset command for debug_sync can
cause subsequent tests to be skipped. This patch adds the
missing statements to the tests.
modified:
mysql-test/suite/backup/r/backup_timeout.result
mysql-test/suite/backup/t/backup_timeout.test
mysql-test/suite/backup_engines/r/backup_online_testing.result
mysql-test/suite/backup_engines/t/backup_online_testing.test
per-file messages:
mysql-test/suite/backup/r/backup_timeout.result
Corrected result file.
mysql-test/suite/backup/t/backup_timeout.test
Add debug sync reset command.
mysql-test/suite/backup_engines/r/backup_online_testing.result
Corrected result file.
mysql-test/suite/backup_engines/t/backup_online_testing.test
Add debug sync reset command.
=== modified file 'mysql-test/suite/backup/r/backup_timeout.result'
=== modified file 'mysql-test/suite/backup/r/backup_timeout.result'
--- a/mysql-test/suite/backup/r/backup_timeout.result 2008-10-07 17:15:44 +0000
+++ b/mysql-test/suite/backup/r/backup_timeout.result 2008-11-14 19:51:01 +0000
@@ -71,3 +71,4 @@
Variable_name Value
backup_wait_timeout 50
DROP DATABASE bup_ddl_blocker;
+SET DEBUG_SYNC= 'reset';
=== modified file 'mysql-test/suite/backup/t/backup_timeout.test'
--- a/mysql-test/suite/backup/t/backup_timeout.test 2008-10-07 17:15:44 +0000
+++ b/mysql-test/suite/backup/t/backup_timeout.test 2008-11-14 19:51:01 +0000
@@ -159,4 +159,6 @@
DROP DATABASE bup_ddl_blocker;
+SET DEBUG_SYNC= 'reset';
+
--remove_file $MYSQLTEST_VARDIR/master-data/bup_ddl_blocker.bak
=== modified file 'mysql-test/suite/backup_engines/r/backup_online_testing.result'
--- a/mysql-test/suite/backup_engines/r/backup_online_testing.result 2008-06-30 19:40:33 +0000
+++ b/mysql-test/suite/backup_engines/r/backup_online_testing.result 2008-11-14 19:51:01 +0000
@@ -1135,3 +1135,4 @@
*** DROP bup_online DATABASE ****
DROP DATABASE bup_online;
+SET DEBUG_SYNC= 'RESET';
=== modified file 'mysql-test/suite/backup_engines/t/backup_online_testing.test'
--- a/mysql-test/suite/backup_engines/t/backup_online_testing.test 2008-06-30 19:40:33 +0000
+++ b/mysql-test/suite/backup_engines/t/backup_online_testing.test 2008-11-14 19:51:01 +0000
@@ -1152,3 +1152,4 @@
remove_file $MYSQLTEST_VARDIR/master-data/bup_online.bak;
+SET DEBUG_SYNC= 'RESET';
