diff options
| author | Alice Sherepa <alice.sherepa@gmail.com> | 2020-01-20 13:56:43 +0100 |
|---|---|---|
| committer | Alice Sherepa <alice.sherepa@gmail.com> | 2020-01-21 11:22:47 +0100 |
| commit | 90e7e6783b8a667012146e16f4d804a0c8b9ee8a (patch) | |
| tree | df4d0724391f8bf0f6541fffb9369ef229590343 | |
| parent | 10a5e1eccb9cfe7b86436254c958b2b40a246b52 (diff) | |
| download | mariadb-git-90e7e6783b8a667012146e16f4d804a0c8b9ee8a.tar.gz | |
MDEV-21360 save/restore debud_dbug instead of total reset at the end of the test
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_corruption.inc | 1 | ||||
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_parallel.inc | 1 | ||||
| -rw-r--r-- | mysql-test/suite/binlog_encryption/rpl_parallel.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_parallel.result | 1 |
4 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_corruption.inc b/mysql-test/extra/rpl_tests/rpl_corruption.inc index c97b3b35766..4106bb45eef 100644 --- a/mysql-test/extra/rpl_tests/rpl_corruption.inc +++ b/mysql-test/extra/rpl_tests/rpl_corruption.inc @@ -74,7 +74,6 @@ while ($i) { # Emulate corruption in binlog file when SHOW BINLOG EVENTS is executing --echo # 2. Corruption in master binlog and SHOW BINLOG EVENTS set @saved_dbug = @@global.debug_dbug; - SET GLOBAL debug_dbug="+d,corrupt_read_log_event_char"; --echo SHOW BINLOG EVENTS; --disable_query_log diff --git a/mysql-test/extra/rpl_tests/rpl_parallel.inc b/mysql-test/extra/rpl_tests/rpl_parallel.inc index e2dbb7c3f18..b88d2126d4d 100644 --- a/mysql-test/extra/rpl_tests/rpl_parallel.inc +++ b/mysql-test/extra/rpl_tests/rpl_parallel.inc @@ -1651,6 +1651,7 @@ SELECT * FROM t2 WHERE a >= 40 ORDER BY a; --sync_with_master SELECT * FROM t2 WHERE a >= 40 ORDER BY a; --source include/stop_slave.inc +SET GLOBAL debug_dbug=@old_dbug; SET DEBUG_SYNC= 'RESET'; SET GLOBAL slave_parallel_threads=0; SET GLOBAL slave_parallel_threads=10; diff --git a/mysql-test/suite/binlog_encryption/rpl_parallel.result b/mysql-test/suite/binlog_encryption/rpl_parallel.result index 20d7687ec3f..12e5455c6c1 100644 --- a/mysql-test/suite/binlog_encryption/rpl_parallel.result +++ b/mysql-test/suite/binlog_encryption/rpl_parallel.result @@ -1227,6 +1227,7 @@ a 45 46 include/stop_slave.inc +SET GLOBAL debug_dbug=@old_dbug; SET DEBUG_SYNC= 'RESET'; SET GLOBAL slave_parallel_threads=0; SET GLOBAL slave_parallel_threads=10; diff --git a/mysql-test/suite/rpl/r/rpl_parallel.result b/mysql-test/suite/rpl/r/rpl_parallel.result index e1dbc15d3b9..657b3ba7448 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel.result +++ b/mysql-test/suite/rpl/r/rpl_parallel.result @@ -1226,6 +1226,7 @@ a 45 46 include/stop_slave.inc +SET GLOBAL debug_dbug=@old_dbug; SET DEBUG_SYNC= 'RESET'; SET GLOBAL slave_parallel_threads=0; SET GLOBAL slave_parallel_threads=10; |