Skip to content

Commit f28ac80

Browse files
author
Mats Kindahl
committed
WL#5151: Conversion between different types
 when replicating Post-merge fixes. Updating result files.
1 parent 42cfe5b commit f28ac80

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Replicate_Do_Table
7676
Replicate_Ignore_Table #
7777
Replicate_Wild_Do_Table
7878
Replicate_Wild_Ignore_Table
79-
Last_Errno 1641
79+
Last_Errno 1642
8080
Last_Error Column 2 of table 'test.t2' cannot be converted from type 'char(10)' to type 'char(5)'
8181
Skip_Counter 0
8282
Exec_Master_Log_Pos #
@@ -94,7 +94,7 @@ Seconds_Behind_Master #
9494
Master_SSL_Verify_Server_Cert No
9595
Last_IO_Errno #
9696
Last_IO_Error #
97-
Last_SQL_Errno 1641
97+
Last_SQL_Errno 1642
9898
Last_SQL_Error Column 2 of table 'test.t2' cannot be converted from type 'char(10)' to type 'char(5)'
9999
Replicate_Ignore_Server_Ids
100100
Master_Server_Id 1
@@ -145,7 +145,7 @@ Replicate_Do_Table
145145
Replicate_Ignore_Table #
146146
Replicate_Wild_Do_Table
147147
Replicate_Wild_Ignore_Table
148-
Last_Errno 1641
148+
Last_Errno 1642
149149
Last_Error Column 0 of table 'test.t3' cannot be converted from type 'tinyblob' to type 'int(11)'
150150
Skip_Counter 0
151151
Exec_Master_Log_Pos #
@@ -163,7 +163,7 @@ Seconds_Behind_Master #
163163
Master_SSL_Verify_Server_Cert No
164164
Last_IO_Errno #
165165
Last_IO_Error #
166-
Last_SQL_Errno 1641
166+
Last_SQL_Errno 1642
167167
Last_SQL_Error Column 0 of table 'test.t3' cannot be converted from type 'tinyblob' to type 'int(11)'
168168
Replicate_Ignore_Server_Ids
169169
Master_Server_Id 1
@@ -209,7 +209,7 @@ Replicate_Do_Table
209209
Replicate_Ignore_Table #
210210
Replicate_Wild_Do_Table
211211
Replicate_Wild_Ignore_Table
212-
Last_Errno 1641
212+
Last_Errno 1642
213213
Last_Error Column 0 of table 'test.t4' cannot be converted from type 'decimal(8,2)' to type 'int(11)'
214214
Skip_Counter 0
215215
Exec_Master_Log_Pos #
@@ -227,7 +227,7 @@ Seconds_Behind_Master #
227227
Master_SSL_Verify_Server_Cert No
228228
Last_IO_Errno #
229229
Last_IO_Error #
230-
Last_SQL_Errno 1641
230+
Last_SQL_Errno 1642
231231
Last_SQL_Error Column 0 of table 'test.t4' cannot be converted from type 'decimal(8,2)' to type 'int(11)'
232232
Replicate_Ignore_Server_Ids
233233
Master_Server_Id 1
@@ -273,7 +273,7 @@ Replicate_Do_Table
273273
Replicate_Ignore_Table #
274274
Replicate_Wild_Do_Table
275275
Replicate_Wild_Ignore_Table
276-
Last_Errno 1641
276+
Last_Errno 1642
277277
Last_Error Column 1 of table 'test.t5' cannot be converted from type 'varchar(6)' to type 'char(5)'
278278
Skip_Counter 0
279279
Exec_Master_Log_Pos #
@@ -291,7 +291,7 @@ Seconds_Behind_Master #
291291
Master_SSL_Verify_Server_Cert No
292292
Last_IO_Errno #
293293
Last_IO_Error #
294-
Last_SQL_Errno 1641
294+
Last_SQL_Errno 1642
295295
Last_SQL_Error Column 1 of table 'test.t5' cannot be converted from type 'varchar(6)' to type 'char(5)'
296296
Replicate_Ignore_Server_Ids
297297
Master_Server_Id 1
@@ -336,7 +336,7 @@ Replicate_Do_Table
336336
Replicate_Ignore_Table #
337337
Replicate_Wild_Do_Table
338338
Replicate_Wild_Ignore_Table
339-
Last_Errno 1641
339+
Last_Errno 1642
340340
Last_Error Column 1 of table 'test.t6' cannot be converted from type 'varchar(6)' to type 'char(5)'
341341
Skip_Counter 0
342342
Exec_Master_Log_Pos #
@@ -354,7 +354,7 @@ Seconds_Behind_Master #
354354
Master_SSL_Verify_Server_Cert No
355355
Last_IO_Errno #
356356
Last_IO_Error #
357-
Last_SQL_Errno 1641
357+
Last_SQL_Errno 1642
358358
Last_SQL_Error Column 1 of table 'test.t6' cannot be converted from type 'varchar(6)' to type 'char(5)'
359359
Replicate_Ignore_Server_Ids
360360
Master_Server_Id 1
@@ -450,7 +450,7 @@ Replicate_Do_Table
450450
Replicate_Ignore_Table #
451451
Replicate_Wild_Do_Table
452452
Replicate_Wild_Ignore_Table
453-
Last_Errno 1641
453+
Last_Errno 1642
454454
Last_Error Column 2 of table 'test.t10' cannot be converted from type 'char(5)' to type 'double'
455455
Skip_Counter 0
456456
Exec_Master_Log_Pos #
@@ -468,7 +468,7 @@ Seconds_Behind_Master #
468468
Master_SSL_Verify_Server_Cert No
469469
Last_IO_Errno #
470470
Last_IO_Error #
471-
Last_SQL_Errno 1641
471+
Last_SQL_Errno 1642
472472
Last_SQL_Error Column 2 of table 'test.t10' cannot be converted from type 'char(5)' to type 'double'
473473
Replicate_Ignore_Server_Ids
474474
Master_Server_Id 1
@@ -513,7 +513,7 @@ Replicate_Do_Table
513513
Replicate_Ignore_Table #
514514
Replicate_Wild_Do_Table
515515
Replicate_Wild_Ignore_Table
516-
Last_Errno 1641
516+
Last_Errno 1642
517517
Last_Error Column 2 of table 'test.t11' cannot be converted from type 'varchar(254)' to type 'int(11)'
518518
Skip_Counter 0
519519
Exec_Master_Log_Pos #
@@ -531,7 +531,7 @@ Seconds_Behind_Master #
531531
Master_SSL_Verify_Server_Cert No
532532
Last_IO_Errno #
533533
Last_IO_Error #
534-
Last_SQL_Errno 1641
534+
Last_SQL_Errno 1642
535535
Last_SQL_Error Column 2 of table 'test.t11' cannot be converted from type 'varchar(254)' to type 'int(11)'
536536
Replicate_Ignore_Server_Ids
537537
Master_Server_Id 1
@@ -907,7 +907,7 @@ Replicate_Do_Table
907907
Replicate_Ignore_Table #
908908
Replicate_Wild_Do_Table
909909
Replicate_Wild_Ignore_Table
910-
Last_Errno 1641
910+
Last_Errno 1642
911911
Last_Error Column 0 of table 'test.t17' cannot be converted from type 'bigint' to type 'smallint(6)'
912912
Skip_Counter 0
913913
Exec_Master_Log_Pos #
@@ -925,8 +925,10 @@ Seconds_Behind_Master #
925925
Master_SSL_Verify_Server_Cert No
926926
Last_IO_Errno #
927927
Last_IO_Error #
928-
Last_SQL_Errno 1641
928+
Last_SQL_Errno 1642
929929
Last_SQL_Error Column 0 of table 'test.t17' cannot be converted from type 'bigint' to type 'smallint(6)'
930+
Replicate_Ignore_Server_Ids
931+
Master_Server_Id 1
930932
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
931933
START SLAVE;
932934
** DROP table t17 ***

0 commit comments

Comments
 (0)