Commit e948f38e authored by He Zhenxing's avatar He Zhenxing

Rmove RESET MASTER from have_log_bin.inc because it can cause some

test to stall for slave_net_timeout and cause some test case fail

mysql-test/include/have_log_bin.inc:
  remove reset master, which can cause some test to stall for slave_net_timeout and cause some test case fail
mysql-test/r/mysqlbinlog_base64.result:
  update result
mysql-test/t/mysqlbinlog_base64.test:
  Add reset master to make sure binlog is clean when the test case start
parent 239fd184
# ==== Purpose ==== # ==== Purpose ====
# #
# Ensure that the server is running with binlogging on and reset the # Ensure that the server is running with binlogging on
# binlog.
# #
# ==== Usage ==== # ==== Usage ====
# #
...@@ -10,5 +9,4 @@ ...@@ -10,5 +9,4 @@
-- require r/have_log_bin.require -- require r/have_log_bin.require
disable_query_log; disable_query_log;
show variables like "log_bin"; show variables like "log_bin";
RESET MASTER;
enable_query_log; enable_query_log;
reset master;
create table t1 (a int); create table t1 (a int);
insert into t1 values (1); insert into t1 values (1);
insert into t1 values (2); insert into t1 values (2);
......
-- source include/have_binlog_format_row.inc -- source include/have_binlog_format_row.inc
#
# Reset master to cleanup binlog
#
reset master;
# #
# Write different events to binlog # Write different events to binlog
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment