Skip to content

Commit 3d85292

Browse files
committed
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.
1 parent 96d097a commit 3d85292

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

mysql-test/extra/rpl_tests/rpl_binlog_errors.inc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ INSERT INTO t2 VALUES ('aaaaa');
308308
DELETE FROM t4;
309309
DELETE FROM t2;
310310
DROP TABLE t5;
311+
flush tables;
311312

312313
-- echo ###################### TEST #11
313314

@@ -336,6 +337,7 @@ INSERT INTO t2 VALUES ('aaaaa');
336337
DELETE FROM t4;
337338
DELETE FROM t2;
338339
DROP TABLE t5;
340+
flush tables;
339341

340342
# restart the server so that we have binlog again
341343
--let $rpl_server_number= 1
@@ -363,6 +365,7 @@ INSERT INTO t2 VALUES ('aaaaa');
363365
DELETE FROM t4;
364366
DELETE FROM t2;
365367
DROP TABLE t5;
368+
flush tables;
366369

367370
# restart the server so that we have binlog again
368371
--let $rpl_server_number= 1

mysql-test/suite/binlog_encryption/rpl_binlog_errors.result

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ INSERT INTO t2 VALUES ('aaaaa');
189189
DELETE FROM t4;
190190
DELETE FROM t2;
191191
DROP TABLE t5;
192+
flush tables;
192193
###################### TEST #11
193194
include/rpl_restart_server.inc [server_number=1]
194195
SET GLOBAL debug_dbug="+d,fault_injection_openning_index";
@@ -203,6 +204,7 @@ INSERT INTO t2 VALUES ('aaaaa');
203204
DELETE FROM t4;
204205
DELETE FROM t2;
205206
DROP TABLE t5;
207+
flush tables;
206208
include/rpl_restart_server.inc [server_number=1]
207209
###################### TEST #12
208210
SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event";
@@ -217,6 +219,7 @@ INSERT INTO t2 VALUES ('aaaaa');
217219
DELETE FROM t4;
218220
DELETE FROM t2;
219221
DROP TABLE t5;
222+
flush tables;
220223
include/rpl_restart_server.inc [server_number=1]
221224
DROP TABLE t1, t2, t4;
222225
RESET MASTER;

mysql-test/suite/rpl/r/rpl_binlog_errors.result

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ INSERT INTO t2 VALUES ('aaaaa');
189189
DELETE FROM t4;
190190
DELETE FROM t2;
191191
DROP TABLE t5;
192+
flush tables;
192193
###################### TEST #11
193194
include/rpl_restart_server.inc [server_number=1]
194195
SET GLOBAL debug_dbug="+d,fault_injection_openning_index";
@@ -203,6 +204,7 @@ INSERT INTO t2 VALUES ('aaaaa');
203204
DELETE FROM t4;
204205
DELETE FROM t2;
205206
DROP TABLE t5;
207+
flush tables;
206208
include/rpl_restart_server.inc [server_number=1]
207209
###################### TEST #12
208210
SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event";
@@ -217,6 +219,7 @@ INSERT INTO t2 VALUES ('aaaaa');
217219
DELETE FROM t4;
218220
DELETE FROM t2;
219221
DROP TABLE t5;
222+
flush tables;
220223
include/rpl_restart_server.inc [server_number=1]
221224
DROP TABLE t1, t2, t4;
222225
RESET MASTER;

0 commit comments

Comments
 (0)