summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorguilhem@gbichot2 <>2003-11-23 17:02:59 +0100
committerguilhem@gbichot2 <>2003-11-23 17:02:59 +0100
commit05e5a35bf2db80d8c880618ad9424a8a52b31f13 (patch)
tree83cd5e156dfb886c15c3d3d13b272fe43f7e430b /mysql-test
parent9b4050c40668834ba4d933fe724af76c39c0fba8 (diff)
downloadmariadb-git-05e5a35bf2db80d8c880618ad9424a8a52b31f13.tar.gz
Replication:
Now the I/O thread (in flush_master_info()) flushes the relay log to disk after reading every event. Slower but provides additionnal safety in case of brutal crash. I had to make the flush optional (i.e. add a if(some_bool_argument) in the function) because sometimes flush_master_info() is called when there is no usable relay log (the relay log's IO_CACHE is not initialized so can't be flushed).
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/rpl_loaddata_rule_m.result2
-rw-r--r--mysql-test/t/rpl_loaddata_rule_m.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_loaddata_rule_m.result b/mysql-test/r/rpl_loaddata_rule_m.result
index ed0c96bbfe1..a34453b0a2b 100644
--- a/mysql-test/r/rpl_loaddata_rule_m.result
+++ b/mysql-test/r/rpl_loaddata_rule_m.result
@@ -5,7 +5,7 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
drop database if exists mysqltest;
-reset master;
+stop slave;
create database mysqltest;
create table t1(a int, b int, unique(b));
use mysqltest;
diff --git a/mysql-test/t/rpl_loaddata_rule_m.test b/mysql-test/t/rpl_loaddata_rule_m.test
index ec3a9259e32..678dae13889 100644
--- a/mysql-test/t/rpl_loaddata_rule_m.test
+++ b/mysql-test/t/rpl_loaddata_rule_m.test
@@ -9,7 +9,7 @@ drop database if exists mysqltest;
--enable_warnings
connection slave;
-reset master;
+stop slave; # don't need slave for this test
# Test logging on master