Skip to content

Commit 42cfe5b

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

File tree

4 files changed

+60
-60
lines changed

4 files changed

+60
-60
lines changed

‎mysql-test/suite/rpl/r/rpl_extraCol_myisam.result

Lines changed: 16 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
@@ -474,7 +474,7 @@ Replicate_Do_Table
474474
Replicate_Ignore_Table #
475475
Replicate_Wild_Do_Table
476476
Replicate_Wild_Ignore_Table
477-
Last_Errno 1641
477+
Last_Errno 1642
478478
Last_Error Column 2 of table 'test.t10' cannot be converted from type 'char(5)' to type 'double'
479479
Skip_Counter 0
480480
Exec_Master_Log_Pos #
@@ -492,7 +492,7 @@ Seconds_Behind_Master #
492492
Master_SSL_Verify_Server_Cert No
493493
Last_IO_Errno #
494494
Last_IO_Error #
495-
Last_SQL_Errno 1641
495+
Last_SQL_Errno 1642
496496
Last_SQL_Error Column 2 of table 'test.t10' cannot be converted from type 'char(5)' to type 'double'
497497
Replicate_Ignore_Server_Ids
498498
Master_Server_Id 1
@@ -537,7 +537,7 @@ Replicate_Do_Table
537537
Replicate_Ignore_Table #
538538
Replicate_Wild_Do_Table
539539
Replicate_Wild_Ignore_Table
540-
Last_Errno 1641
540+
Last_Errno 1642
541541
Last_Error Column 2 of table 'test.t11' cannot be converted from type 'varchar(254)' to type 'int(11)'
542542
Skip_Counter 0
543543
Exec_Master_Log_Pos #
@@ -555,7 +555,7 @@ Seconds_Behind_Master #
555555
Master_SSL_Verify_Server_Cert No
556556
Last_IO_Errno #
557557
Last_IO_Error #
558-
Last_SQL_Errno 1641
558+
Last_SQL_Errno 1642
559559
Last_SQL_Error Column 2 of table 'test.t11' cannot be converted from type 'varchar(254)' to type 'int(11)'
560560
Replicate_Ignore_Server_Ids
561561
Master_Server_Id 1
@@ -931,7 +931,7 @@ Replicate_Do_Table
931931
Replicate_Ignore_Table #
932932
Replicate_Wild_Do_Table
933933
Replicate_Wild_Ignore_Table
934-
Last_Errno 1641
934+
Last_Errno 1642
935935
Last_Error Column 0 of table 'test.t17' cannot be converted from type 'bigint' to type 'smallint(6)'
936936
Skip_Counter 0
937937
Exec_Master_Log_Pos #
@@ -949,7 +949,7 @@ Seconds_Behind_Master #
949949
Master_SSL_Verify_Server_Cert No
950950
Last_IO_Errno #
951951
Last_IO_Error #
952-
Last_SQL_Errno 1641
952+
Last_SQL_Errno 1642
953953
Last_SQL_Error Column 0 of table 'test.t17' cannot be converted from type 'bigint' to type 'smallint(6)'
954954
Replicate_Ignore_Server_Ids
955955
Master_Server_Id 1

‎mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ Replicate_Do_Table
567567
Replicate_Ignore_Table
568568
Replicate_Wild_Do_Table
569569
Replicate_Wild_Ignore_Table
570-
Last_Errno 1641
570+
Last_Errno 1642
571571
Last_Error Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
572572
Skip_Counter 0
573573
Exec_Master_Log_Pos #
@@ -585,7 +585,7 @@ Seconds_Behind_Master #
585585
Master_SSL_Verify_Server_Cert No
586586
Last_IO_Errno #
587587
Last_IO_Error #
588-
Last_SQL_Errno 1641
588+
Last_SQL_Errno 1642
589589
Last_SQL_Error Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
590590
Replicate_Ignore_Server_Ids
591591
Master_Server_Id 1
@@ -644,7 +644,7 @@ Replicate_Do_Table
644644
Replicate_Ignore_Table
645645
Replicate_Wild_Do_Table
646646
Replicate_Wild_Ignore_Table
647-
Last_Errno 1641
647+
Last_Errno 1642
648648
Last_Error Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
649649
Skip_Counter 0
650650
Exec_Master_Log_Pos #
@@ -662,7 +662,7 @@ Seconds_Behind_Master #
662662
Master_SSL_Verify_Server_Cert No
663663
Last_IO_Errno #
664664
Last_IO_Error #
665-
Last_SQL_Errno 1641
665+
Last_SQL_Errno 1642
666666
Last_SQL_Error Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
667667
Replicate_Ignore_Server_Ids
668668
Master_Server_Id 1
@@ -1722,7 +1722,7 @@ Replicate_Do_Table
17221722
Replicate_Ignore_Table
17231723
Replicate_Wild_Do_Table
17241724
Replicate_Wild_Ignore_Table
1725-
Last_Errno 1641
1725+
Last_Errno 1642
17261726
Last_Error Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
17271727
Skip_Counter 0
17281728
Exec_Master_Log_Pos #
@@ -1740,7 +1740,7 @@ Seconds_Behind_Master #
17401740
Master_SSL_Verify_Server_Cert No
17411741
Last_IO_Errno #
17421742
Last_IO_Error #
1743-
Last_SQL_Errno 1641
1743+
Last_SQL_Errno 1642
17441744
Last_SQL_Error Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
17451745
Replicate_Ignore_Server_Ids
17461746
Master_Server_Id 1
@@ -1799,7 +1799,7 @@ Replicate_Do_Table
17991799
Replicate_Ignore_Table
18001800
Replicate_Wild_Do_Table
18011801
Replicate_Wild_Ignore_Table
1802-
Last_Errno 1641
1802+
Last_Errno 1642
18031803
Last_Error Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
18041804
Skip_Counter 0
18051805
Exec_Master_Log_Pos #
@@ -1817,7 +1817,7 @@ Seconds_Behind_Master #
18171817
Master_SSL_Verify_Server_Cert No
18181818
Last_IO_Errno #
18191819
Last_IO_Error #
1820-
Last_SQL_Errno 1641
1820+
Last_SQL_Errno 1642
18211821
Last_SQL_Error Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
18221822
Replicate_Ignore_Server_Ids
18231823
Master_Server_Id 1
@@ -2877,7 +2877,7 @@ Replicate_Do_Table
28772877
Replicate_Ignore_Table
28782878
Replicate_Wild_Do_Table
28792879
Replicate_Wild_Ignore_Table
2880-
Last_Errno 1641
2880+
Last_Errno 1642
28812881
Last_Error Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
28822882
Skip_Counter 0
28832883
Exec_Master_Log_Pos #
@@ -2895,7 +2895,7 @@ Seconds_Behind_Master #
28952895
Master_SSL_Verify_Server_Cert No
28962896
Last_IO_Errno #
28972897
Last_IO_Error #
2898-
Last_SQL_Errno 1641
2898+
Last_SQL_Errno 1642
28992899
Last_SQL_Error Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
29002900
Replicate_Ignore_Server_Ids
29012901
Master_Server_Id 1
@@ -2954,7 +2954,7 @@ Replicate_Do_Table
29542954
Replicate_Ignore_Table
29552955
Replicate_Wild_Do_Table
29562956
Replicate_Wild_Ignore_Table
2957-
Last_Errno 1641
2957+
Last_Errno 1642
29582958
Last_Error Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
29592959
Skip_Counter 0
29602960
Exec_Master_Log_Pos #
@@ -2972,7 +2972,7 @@ Seconds_Behind_Master #
29722972
Master_SSL_Verify_Server_Cert No
29732973
Last_IO_Errno #
29742974
Last_IO_Error #
2975-
Last_SQL_Errno 1641
2975+
Last_SQL_Errno 1642
29762976
Last_SQL_Error Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
29772977
Replicate_Ignore_Server_Ids
29782978
Master_Server_Id 1

0 commit comments

Comments
 (0)