merge from 5.1-mtr

2025-07-30 16:24:05 +03:00 · 2010-11-09 11:20:50 +01:00
parent 8e0f8d438b 866cec611a
commit 6eaa3c0750
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 @@
 -O max_binlog_size=4096
+--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