WL#5151: Conversion between different types

         when replicating

Post-merge fixes. Updating result files.

mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result

@@ -76,7 +76,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1641
+Last_Errno	1642
 Last_Error	Column 2 of table 'test.t2' cannot be converted from type 'char(10)' to type 'char(5)'
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -94,7 +94,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1641
+Last_SQL_Errno	1642
 Last_SQL_Error	Column 2 of table 'test.t2' cannot be converted from type 'char(10)' to type 'char(5)'
 Replicate_Ignore_Server_Ids	
 Master_Server_Id	1
@@ -145,7 +145,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1641
+Last_Errno	1642
 Last_Error	Column 0 of table 'test.t3' cannot be converted from type 'tinyblob' to type 'int(11)'
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -163,7 +163,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1641
+Last_SQL_Errno	1642
 Last_SQL_Error	Column 0 of table 'test.t3' cannot be converted from type 'tinyblob' to type 'int(11)'
 Replicate_Ignore_Server_Ids	
 Master_Server_Id	1
@@ -209,7 +209,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1641
+Last_Errno	1642
 Last_Error	Column 0 of table 'test.t4' cannot be converted from type 'decimal(8,2)' to type 'int(11)'
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -227,7 +227,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1641
+Last_SQL_Errno	1642
 Last_SQL_Error	Column 0 of table 'test.t4' cannot be converted from type 'decimal(8,2)' to type 'int(11)'
 Replicate_Ignore_Server_Ids	
 Master_Server_Id	1
@@ -273,7 +273,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1641
+Last_Errno	1642
 Last_Error	Column 1 of table 'test.t5' cannot be converted from type 'varchar(6)' to type 'char(5)'
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -291,7 +291,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1641
+Last_SQL_Errno	1642
 Last_SQL_Error	Column 1 of table 'test.t5' cannot be converted from type 'varchar(6)' to type 'char(5)'
 Replicate_Ignore_Server_Ids	
 Master_Server_Id	1
@@ -336,7 +336,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1641
+Last_Errno	1642
 Last_Error	Column 1 of table 'test.t6' cannot be converted from type 'varchar(6)' to type 'char(5)'
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -354,7 +354,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1641
+Last_SQL_Errno	1642
 Last_SQL_Error	Column 1 of table 'test.t6' cannot be converted from type 'varchar(6)' to type 'char(5)'
 Replicate_Ignore_Server_Ids	
 Master_Server_Id	1
@@ -450,7 +450,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1641
+Last_Errno	1642
 Last_Error	Column 2 of table 'test.t10' cannot be converted from type 'char(5)' to type 'double'
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -468,7 +468,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1641
+Last_SQL_Errno	1642
 Last_SQL_Error	Column 2 of table 'test.t10' cannot be converted from type 'char(5)' to type 'double'
 Replicate_Ignore_Server_Ids	
 Master_Server_Id	1
@@ -513,7 +513,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1641
+Last_Errno	1642
 Last_Error	Column 2 of table 'test.t11' cannot be converted from type 'varchar(254)' to type 'int(11)'
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -531,7 +531,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1641
+Last_SQL_Errno	1642
 Last_SQL_Error	Column 2 of table 'test.t11' cannot be converted from type 'varchar(254)' to type 'int(11)'
 Replicate_Ignore_Server_Ids	
 Master_Server_Id	1
@@ -907,7 +907,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1641
+Last_Errno	1642
 Last_Error	Column 0 of table 'test.t17' cannot be converted from type 'bigint' to type 'smallint(6)'
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -925,8 +925,10 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1641
+Last_SQL_Errno	1642
 Last_SQL_Error	Column 0 of table 'test.t17' cannot be converted from type 'bigint' to type 'smallint(6)'
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
 ** DROP table t17 ***