1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into mysql.sashanet.com:/home/sasha/src/bk/mysql
This commit is contained in:
sasha@mysql.sashanet.com 2000-12-08 07:11:45 -07:00
commit 17061d609f
5 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/master-slave.inc
View File

@ -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';

2
mysql-test/r/slave-running.result Normal file
View File

@ -0,0 +1,2 @@
Variable_name Value
Slave_running ON

2
mysql-test/r/slave-stopped.result Normal file
View File

@ -0,0 +1,2 @@
Variable_name Value
Slave_running OFF

2
sql/log_event.cc
View File

@ -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)
{ {

BIN
sql/share/romanian/errmsg.sys
View File

Binary file not shown.