From 6b7098cb2047e731591bf06ecdb4a0472cb543c2 Mon Sep 17 00:00:00 2001
From: "sasha@mysql.sashanet.com" <>
Date: Fri, 8 Dec 2000 07:11:22 -0700
Subject: [PATCH] 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 |   4 +++-
 mysql-test/r/slave-running.result   |   2 ++
 mysql-test/r/slave-stopped.result   |   2 ++
 sql/log_event.cc                    |   2 +-
 sql/share/romanian/errmsg.sys       | Bin 12003 -> 12006 bytes
 5 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 mysql-test/r/slave-running.result
 create mode 100644 mysql-test/r/slave-stopped.result

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	
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 9d7e935f3ef..fa6ac4f45fc 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -572,7 +572,7 @@ Load_log_event::Load_log_event(IO_CACHE* file, time_t when, uint32 server_id):
 }
 
 Load_log_event::Load_log_event(const char* buf, int event_len):
-  Log_event(when,0,0,server_id),data_buf(0),num_fields(0),fields(0),
+  Log_event(buf),data_buf(0),num_fields(0),fields(0),
   field_lens(0),field_block_len(0),
   table_name(0),db(0),fname(0)
 {
diff --git a/sql/share/romanian/errmsg.sys b/sql/share/romanian/errmsg.sys
index a8336a034a83403e3b9e1bd8495345bfd2f5a3a9..33064816f614ac88556dc7791826fa490802cef2 100644
GIT binary patch
delta 28
kcmaDH`z)68-#;csMg}Y0V;eaaGBR1}ZeGP`smsU!0HVzaLjV8(

delta 23
fcmaDB`#6^K-#;csMg~jWqZ>IFGHzbOXsHVTcu)x1