upmerge 57840

2025-08-01 03:47:19 +03:00 · 2010-11-05 15:36:00 +01:00
parent cf1b01e28f 866cec611a
commit c4c198092c
14 changed files with 62 additions and 30 deletions
--- a/mysql-test/suite/binlog/t/binlog_index-master.opt
+++ b/mysql-test/suite/binlog/t/binlog_index-master.opt
@ -0,0 +1 @@
+--force-restart
--- a/mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt
+++ b/mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt
@ -1 +1,2 @@
 --max_binlog_size=4096 --default-storage-engine=MyISAM
+--force-restart
--- a/mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
+++ b/mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
@ -1 +1,2 @@
 --binlog-do-db=b42829
+--force-restart