summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2000-12-08 07:11:22 -0700
committerunknown <sasha@mysql.sashanet.com>2000-12-08 07:11:22 -0700
commit464471ae7519ea13930e515237f03d4040c96416 (patch)
treea4a9077b0d73cbf688a84c248e633a7bd14e9743 /mysql-test
parent417f8c3fde9ac028bb1be4147edf67318af78f8d (diff)
downloadmariadb-git-464471ae7519ea13930e515237f03d4040c96416.tar.gz
fixed bug in load data infile replication
updated test suite to always test if slave obeys stop/start commands mysql-test/include/master-slave.inc: test if the slave actually stops and starts in response to slave start/slave stop sql/log_event.cc: call the right constructor - I am 99% sure this is what cause sporadic failures of rpl000001 sql/share/romanian/errmsg.sys: not changed
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/include/master-slave.inc4
-rw-r--r--mysql-test/r/slave-running.result2
-rw-r--r--mysql-test/r/slave-stopped.result2
3 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc
index 137749912a7..8270c0e46f6 100644
--- a/mysql-test/include/master-slave.inc
+++ b/mysql-test/include/master-slave.inc
@@ -4,8 +4,10 @@ connect (slave,localhost,root,,test,0,var/tmp/mysql-slave.sock);
connect (slave1,localhost,root,,test,0,var/tmp/mysql-slave.sock);
connection slave;
!slave stop;
+@r/slave-stopped.result show status like 'Slave_running';
connection master;
reset master;
connection slave;
reset slave;
-!slave start;
+slave start;
+@r/slave-running.result show status like 'Slave_running';
diff --git a/mysql-test/r/slave-running.result b/mysql-test/r/slave-running.result
new file mode 100644
index 00000000000..1dc7c7ddd9c
--- /dev/null
+++ b/mysql-test/r/slave-running.result
@@ -0,0 +1,2 @@
+Variable_name Value
+Slave_running ON
diff --git a/mysql-test/r/slave-stopped.result b/mysql-test/r/slave-stopped.result
new file mode 100644
index 00000000000..64323ecc0f3
--- /dev/null
+++ b/mysql-test/r/slave-stopped.result
@@ -0,0 +1,2 @@
+Variable_name Value
+Slave_running OFF