diff options
| -rw-r--r-- | mysql-test/include/master-slave.inc | 4 | ||||
| -rw-r--r-- | mysql-test/r/slave-running.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/slave-stopped.result | 2 | ||||
| -rw-r--r-- | sql/log_event.cc | 2 | ||||
| -rw-r--r-- | sql/share/romanian/errmsg.sys | bin | 12003 -> 12006 bytes |
5 files changed, 8 insertions, 2 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 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 Binary files differindex a8336a034a8..33064816f61 100644 --- a/sql/share/romanian/errmsg.sys +++ b/sql/share/romanian/errmsg.sys |