Commit 2401f86c authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files

Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
parents 8db7aebc 48463069

mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result

+16 −16
Original line number Diff line number Diff line
@@ -440,14 +440,14 @@ f1 f2 f3 f4 
select * from t4 order by f1;

f1	f2	f3	f4

1	1	1	first

select * from t31 order by f1;

select * from t31 order by f3;

f1	f2	f3	f4

1	1	5	fifth

1	1	3	third

1	1	1	first

1	1	6	sixth

1	1	2	second

1	1	3	third

1	1	4	fourth

1	1	5	fifth

1	1	6	sixth



** Do updates master **
@@ -563,7 +563,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1534

Last_Errno	1535

Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -581,7 +581,7 @@ Seconds_Behind_Master # 
Master_SSL_Verify_Server_Cert	No

Last_IO_Errno	#

Last_IO_Error	#

Last_SQL_Errno	1534

Last_SQL_Errno	1535

Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -638,7 +638,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1534

Last_Errno	1535

Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -656,7 +656,7 @@ Seconds_Behind_Master # 
Master_SSL_Verify_Server_Cert	No

Last_IO_Errno	#

Last_IO_Error	#

Last_SQL_Errno	1534

Last_SQL_Errno	1535

Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -1581,14 +1581,14 @@ f1 f2 f3 f4 
select * from t4 order by f1;

f1	f2	f3	f4

1	1	1	first

select * from t31 order by f1;

select * from t31 order by f3;

f1	f2	f3	f4

1	1	5	fifth

1	1	3	third

1	1	1	first

1	1	6	sixth

1	1	2	second

1	1	3	third

1	1	4	fourth

1	1	5	fifth

1	1	6	sixth



** Do updates master **
@@ -1704,7 +1704,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1534

Last_Errno	1535

Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -1722,7 +1722,7 @@ Seconds_Behind_Master # 
Master_SSL_Verify_Server_Cert	No

Last_IO_Errno	#

Last_IO_Error	#

Last_SQL_Errno	1534

Last_SQL_Errno	1535

Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -1779,7 +1779,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1534

Last_Errno	1535

Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -1797,7 +1797,7 @@ Seconds_Behind_Master # 
Master_SSL_Verify_Server_Cert	No

Last_IO_Errno	#

Last_IO_Error	#

Last_SQL_Errno	1534

Last_SQL_Errno	1535

Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;