Commit bef71c9a authored by unknown's avatar unknown

Merge work.mysql.com:/home/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql

parents 9c8afb1f 464471ae
No related merge requests found
...@@ -4,8 +4,10 @@ connect (slave,localhost,root,,test,0,var/tmp/mysql-slave.sock); ...@@ -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); connect (slave1,localhost,root,,test,0,var/tmp/mysql-slave.sock);
connection slave; connection slave;
!slave stop; !slave stop;
@r/slave-stopped.result show status like 'Slave_running';
connection master; connection master;
reset master; reset master;
connection slave; connection slave;
reset slave; reset slave;
!slave start; slave start;
@r/slave-running.result show status like 'Slave_running';
Variable_name Value
Slave_running ON
Variable_name Value
Slave_running OFF
...@@ -572,7 +572,7 @@ Load_log_event::Load_log_event(IO_CACHE* file, time_t when, uint32 server_id): ...@@ -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): 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), field_lens(0),field_block_len(0),
table_name(0),db(0),fname(0) table_name(0),db(0),fname(0)
{ {
......
No preview for this file type
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment