diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-02-14 17:28:59 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-02-14 20:43:41 +0100 |
commit | 3d85292afd7f332155b2c574b642490fd026b3ba (patch) | |
tree | f0ea8ae21be72d67a061f8b8e92847d1c4830ecf /mysql-test | |
parent | 96d097a7fa16f8c4dd0b65df23d7be506297cf9e (diff) | |
download | mariadb-git-3d85292afd7f332155b2c574b642490fd026b3ba.tar.gz |
sporadic failures of rpl.rpl_binlog_errors
the test restarts the server, giving it 60 seconds to shutdown
and then killing it mercilessly.
make sure the server closes all MyISAM tables before shutdown,
as we cannot reliably expect it to make the deadline.
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/extra/rpl_tests/rpl_binlog_errors.inc | 3 | ||||
-rw-r--r-- | mysql-test/suite/binlog_encryption/rpl_binlog_errors.result | 3 | ||||
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_binlog_errors.result | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_binlog_errors.inc b/mysql-test/extra/rpl_tests/rpl_binlog_errors.inc index 36568d7ddd5..49ab4f386bf 100644 --- a/mysql-test/extra/rpl_tests/rpl_binlog_errors.inc +++ b/mysql-test/extra/rpl_tests/rpl_binlog_errors.inc @@ -308,6 +308,7 @@ INSERT INTO t2 VALUES ('aaaaa'); DELETE FROM t4; DELETE FROM t2; DROP TABLE t5; +flush tables; -- echo ###################### TEST #11 @@ -336,6 +337,7 @@ INSERT INTO t2 VALUES ('aaaaa'); DELETE FROM t4; DELETE FROM t2; DROP TABLE t5; +flush tables; # restart the server so that we have binlog again --let $rpl_server_number= 1 @@ -363,6 +365,7 @@ INSERT INTO t2 VALUES ('aaaaa'); DELETE FROM t4; DELETE FROM t2; DROP TABLE t5; +flush tables; # restart the server so that we have binlog again --let $rpl_server_number= 1 diff --git a/mysql-test/suite/binlog_encryption/rpl_binlog_errors.result b/mysql-test/suite/binlog_encryption/rpl_binlog_errors.result index 8d9191fb806..06be72d523b 100644 --- a/mysql-test/suite/binlog_encryption/rpl_binlog_errors.result +++ b/mysql-test/suite/binlog_encryption/rpl_binlog_errors.result @@ -189,6 +189,7 @@ INSERT INTO t2 VALUES ('aaaaa'); DELETE FROM t4; DELETE FROM t2; DROP TABLE t5; +flush tables; ###################### TEST #11 include/rpl_restart_server.inc [server_number=1] SET GLOBAL debug_dbug="+d,fault_injection_openning_index"; @@ -203,6 +204,7 @@ INSERT INTO t2 VALUES ('aaaaa'); DELETE FROM t4; DELETE FROM t2; DROP TABLE t5; +flush tables; include/rpl_restart_server.inc [server_number=1] ###################### TEST #12 SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event"; @@ -217,6 +219,7 @@ INSERT INTO t2 VALUES ('aaaaa'); DELETE FROM t4; DELETE FROM t2; DROP TABLE t5; +flush tables; include/rpl_restart_server.inc [server_number=1] DROP TABLE t1, t2, t4; RESET MASTER; diff --git a/mysql-test/suite/rpl/r/rpl_binlog_errors.result b/mysql-test/suite/rpl/r/rpl_binlog_errors.result index 8d9191fb806..06be72d523b 100644 --- a/mysql-test/suite/rpl/r/rpl_binlog_errors.result +++ b/mysql-test/suite/rpl/r/rpl_binlog_errors.result @@ -189,6 +189,7 @@ INSERT INTO t2 VALUES ('aaaaa'); DELETE FROM t4; DELETE FROM t2; DROP TABLE t5; +flush tables; ###################### TEST #11 include/rpl_restart_server.inc [server_number=1] SET GLOBAL debug_dbug="+d,fault_injection_openning_index"; @@ -203,6 +204,7 @@ INSERT INTO t2 VALUES ('aaaaa'); DELETE FROM t4; DELETE FROM t2; DROP TABLE t5; +flush tables; include/rpl_restart_server.inc [server_number=1] ###################### TEST #12 SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event"; @@ -217,6 +219,7 @@ INSERT INTO t2 VALUES ('aaaaa'); DELETE FROM t4; DELETE FROM t2; DROP TABLE t5; +flush tables; include/rpl_restart_server.inc [server_number=1] DROP TABLE t1, t2, t4; RESET MASTER; |