Commit e1a360ad authored by unknown's avatar unknown
Browse files

Merging with mysql-5.1-new-rpl 


mysql-test/r/rpl_row_delayed_ins.result:
  Manual merge.
parents af71cac0 e4146a9f

mysql-test/extra/rpl_tests/rpl_deadlock.test

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ show slave status; 


stop slave;

delete from t3;

change master to master_log_pos=544; # the BEGIN log event

change master to master_log_pos=547; # the BEGIN log event

begin;

select * from t2 for update; # hold lock

start slave;
@@ -107,7 +107,7 @@ set global max_relay_log_size=0; 
# This is really copy-paste of 2) of above

stop slave;

delete from t3;

change master to master_log_pos=544;

change master to master_log_pos=547;

begin;

select * from t2 for update;

start slave;

mysql-test/extra/rpl_tests/rpl_log.test

+3 −3
Original line number Diff line number Diff line
@@ -42,13 +42,13 @@ select count(*) from t1; 
show binlog events;

--replace_column 2 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/

show binlog events from 102 limit 1;

show binlog events from 105 limit 1;

--replace_column 2 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/

show binlog events from 102 limit 2;

show binlog events from 105 limit 2;

--replace_column 2 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/

show binlog events from 102 limit 2,1;

show binlog events from 105 limit 2,1;

flush logs;



# We need an extra update before doing save_master_pos.

mysql-test/extra/rpl_tests/rpl_row_charset.test

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ drop database mysqltest2; 
drop database mysqltest3;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events from 102;

show binlog events from 105;

sync_slave_with_master;



# Check that we can change global.collation_server (since 5.0.3)

mysql-test/r/rpl_000015.result

+2 −2
Original line number Diff line number Diff line 
reset master;

show master status;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000001	102		

master-bin.000001	105		

reset slave;

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
@@ -17,7 +17,7 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File 
start slave;

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

#	127.0.0.1	root	MASTER_PORT	7	master-bin.000001	102	#	#	master-bin.000001	Yes	Yes							0		0	102	#	None		0	No						#

#	127.0.0.1	root	MASTER_PORT	7	master-bin.000001	105	#	#	master-bin.000001	Yes	Yes							0		0	105	#	None		0	No						#

drop table if exists t1;

create table t1 (n int, PRIMARY KEY(n));

insert into t1 values (10),(45),(90);

mysql-test/r/rpl_change_master.result

+2 −2
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ insert into t1 values(2); 
stop slave;

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

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	#	#	#	master-bin.000001	No	No							0		0	187	#	None		0	No						#

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	#	#	#	master-bin.000001	No	No							0		0	190	#	None		0	No						#

change master to master_user='root';

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

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	#	#	#	master-bin.000001	No	No							0		0	187	#	None		0	No						#

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	#	#	#	master-bin.000001	No	No							0		0	190	#	None		0	No						#

start slave;

select * from t1;

n