diff options
| author | He Zhenxing <hezx@mysql.com> | 2008-07-28 15:15:20 +0800 |
|---|---|---|
| committer | He Zhenxing <hezx@mysql.com> | 2008-07-28 15:15:20 +0800 |
| commit | e948f38eae03fb938c43f9ecfafac96aaa7a8077 (patch) | |
| tree | 8a6dd55bbde9bd06b1da6ed339150246dbd709c1 | |
| parent | 239fd1841184e2c8b39175d941a11950c808dd0c (diff) | |
| download | mariadb-git-e948f38eae03fb938c43f9ecfafac96aaa7a8077.tar.gz | |
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
| -rw-r--r-- | mysql-test/include/have_log_bin.inc | 4 | ||||
| -rw-r--r-- | mysql-test/r/mysqlbinlog_base64.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/mysqlbinlog_base64.test | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/mysql-test/include/have_log_bin.inc b/mysql-test/include/have_log_bin.inc index 13d31b70674..1c65f9352d8 100644 --- a/mysql-test/include/have_log_bin.inc +++ b/mysql-test/include/have_log_bin.inc @@ -1,7 +1,6 @@ # ==== Purpose ==== # -# Ensure that the server is running with binlogging on and reset the -# binlog. +# Ensure that the server is running with binlogging on # # ==== Usage ==== # @@ -10,5 +9,4 @@ -- require r/have_log_bin.require disable_query_log; show variables like "log_bin"; -RESET MASTER; enable_query_log; diff --git a/mysql-test/r/mysqlbinlog_base64.result b/mysql-test/r/mysqlbinlog_base64.result index 436b165cfa3..c5e1e2f8ca1 100644 --- a/mysql-test/r/mysqlbinlog_base64.result +++ b/mysql-test/r/mysqlbinlog_base64.result @@ -1,3 +1,4 @@ +reset master; create table t1 (a int); insert into t1 values (1); insert into t1 values (2); diff --git a/mysql-test/t/mysqlbinlog_base64.test b/mysql-test/t/mysqlbinlog_base64.test index 71def6a733a..fb21e28fdcb 100644 --- a/mysql-test/t/mysqlbinlog_base64.test +++ b/mysql-test/t/mysqlbinlog_base64.test @@ -1,5 +1,10 @@ -- source include/have_binlog_format_row.inc # +# Reset master to cleanup binlog +# +reset master; + +# # Write different events to binlog # create table t1 (a int); |