Commit 17061d60 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

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

into mysql.sashanet.com:/home/sasha/src/bk/mysql
parents 3afbfc2b 6b7098cb

mysql-test/include/master-slave.inc

+3 −1
Original line number Diff line number Diff line
@@ -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';

mysql-test/r/slave-running.result

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Variable_name	Value	

Slave_running	ON

mysql-test/r/slave-stopped.result

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Variable_name	Value	

Slave_running	OFF

sql/log_event.cc

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

sql/share/romanian/errmsg.sys

+3 B (11.7 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file