Commit 0b5f0923 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
parents b35b11ee b07be12e

mysql-test/r/rpl_deadlock_innodb.result

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

stop slave;

delete from t3;

change master to master_log_pos=544;
@@ -132,6 +133,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

set @my_max_relay_log_size= @@global.max_relay_log_size;

set global max_relay_log_size=0;

stop slave;
@@ -191,6 +193,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

drop table t1,t2,t3,t4;

set global max_relay_log_size= @my_max_relay_log_size;

End of 5.1 tests

mysql-test/r/rpl_extraCol_innodb.result

+8 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Drop t3  ***
@@ -144,6 +145,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Drop t4  ***
@@ -201,6 +203,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Drop t5  ***
@@ -257,6 +260,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;

*** Drop t6  ***

DROP TABLE t6;
@@ -364,6 +368,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Drop t10  ***
@@ -420,6 +425,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Drop t11  ***
@@ -605,6 +611,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Try to insert in master ****
@@ -735,6 +742,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

** DROP table t17 ***

mysql-test/r/rpl_extraCol_myisam.result

+8 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Drop t3  ***
@@ -144,6 +145,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Drop t4  ***
@@ -201,6 +203,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Drop t5  ***
@@ -257,6 +260,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;

*** Drop t6  ***

DROP TABLE t6;
@@ -364,6 +368,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Drop t10  ***
@@ -420,6 +425,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Drop t11  ***
@@ -605,6 +611,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Try to insert in master ****
@@ -735,6 +742,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

** DROP table t17 ***

mysql-test/r/rpl_ndb_basic.result

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	<Seconds_Behind_Master>

Master_SSL_Verify_Server_Cert	No

set GLOBAL slave_transaction_retries=10;

START SLAVE;

select * from t1 order by nid;

mysql-test/r/rpl_ndb_extraCol.result

+8 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Drop t3  ***
@@ -144,6 +145,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Drop t4  ***
@@ -201,6 +203,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Drop t5  ***
@@ -257,6 +260,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;

*** Drop t6  ***

DROP TABLE t6;
@@ -364,6 +368,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Drop t10  ***
@@ -420,6 +425,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Drop t11  ***
@@ -605,6 +611,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Try to insert in master ****
@@ -736,6 +743,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

** DROP table t17 ***