Commit 46e4eabf authored by unknown's avatar unknown
Browse files

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/r/rpl_ndb_sync.result:
  manual merge
mysql-test/t/disabled.def:
  SCCS merged
mysql-test/t/rpl_ndb_sync.test:
  manual merge
parents c7766a95 545ac7f3

mysql-test/extra/rpl_tests/rpl_row_sp003.test

+4 −1
Original line number Diff line number Diff line
@@ -46,7 +46,10 @@ CALL test.p2(); 
SELECT release_lock("test");

SELECT * FROM test.t1; 

#show binlog events;



# Added sleep for use with NDB to ensure that

# the injector thread will populate log before

# we switch to the slave.

sleep 5;

sync_slave_with_master;

connection slave;

SELECT * FROM test.t1;

mysql-test/r/rpl_multi_delete.result

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ reset master; 
reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

create table t1 (a int);

create table t1 (a int primary key);

create table t2 (a int);

insert into t1 values (1);

insert into t2 values (1);

mysql-test/r/rpl_multi_delete2.result

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ use mysqltest_to; 
select * from a;

i

3

create table t1 (a int);

create table t1 (a int primary key);

create table t2 (a int);

insert into t1 values (1);

insert into t2 values (1);

mysql-test/r/rpl_ndb_idempotent.result

+1 −0
Original line number Diff line number Diff line
@@ -70,3 +70,4 @@ row2 new on slave 2 
SHOW SLAVE STATUS;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

<Slave_IO_State>	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	<Read_Master_Log_Pos>	<Relay_Log_File>	<Relay_Log_Pos>	master-bin.000001	Yes	Yes				<Replicate_Ignore_Table>			0		0	<Exec_Master_Log_Pos>	<Relay_Log_Space>	None		0	No						<Seconds_Behind_Master>

DROP TABLE IF EXISTS t1;