Skip to content

Commit 2757781

Browse files
author
Steinar H. Gunderson
committed
Bug #26399073: MYSQL DOES NOT COMPILE WITH CLANG ON WINDOWS [noclose]
Make stored procedures lock their tables in sorted order; fixes binlog_nogtid.binlog_unsafe on Clang on Windows. This also obsoletes the requirement for some replication tests to have separate Windows versions. Backport to 8.0. Change-Id: Ie6e733092ea9819957be29e9bc9f828679507dec
1 parent 51b3a85 commit 2757781

12 files changed

+246
-1806
lines changed

‎mysql-test/extra/rpl_tests/rpl_auto_increment_update_failure.inc‎

Lines changed: 0 additions & 211 deletions
This file was deleted.

‎mysql-test/suite/binlog_nogtid/r/binlog_unsafe.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2594,12 +2594,12 @@ include/show_binlog_events.inc
25942594
Log_name Pos Event_type Server_id End_log_pos Info
25952595
binlog.000001 # Query # # BEGIN
25962596
binlog.000001 # Table_map # # table_id: # (test.t1)
2597-
binlog.000001 # Table_map # # table_id: # (test.t3)
25982597
binlog.000001 # Table_map # # table_id: # (test.t2)
2598+
binlog.000001 # Table_map # # table_id: # (test.t3)
25992599
binlog.000001 # Write_rows # # table_id: # flags: STMT_END_F
26002600
binlog.000001 # Table_map # # table_id: # (test.t1)
2601-
binlog.000001 # Table_map # # table_id: # (test.t3)
26022601
binlog.000001 # Table_map # # table_id: # (test.t2)
2602+
binlog.000001 # Table_map # # table_id: # (test.t3)
26032603
binlog.000001 # Write_rows # # table_id: #
26042604
binlog.000001 # Write_rows # # table_id: # flags: STMT_END_F
26052605
binlog.000001 # Query # # COMMIT

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ master-bin.000001 # Write_rows # # table_id: #
5656
master-bin.000001 # Write_rows # # table_id: #
5757
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
5858
master-bin.000001 # Table_map # # table_id: # (test.t3)
59-
master-bin.000001 # Table_map # # table_id: # (test.t5)
6059
master-bin.000001 # Table_map # # table_id: # (test.t4)
60+
master-bin.000001 # Table_map # # table_id: # (test.t5)
6161
master-bin.000001 # Table_map # # table_id: # (test.t6)
6262
master-bin.000001 # Write_rows # # table_id: #
6363
master-bin.000001 # Write_rows # # table_id: #
@@ -84,8 +84,8 @@ master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
8484
master-bin.000001 # Xid # # COMMIT /* XID */
8585
master-bin.000001 # Query # # BEGIN
8686
master-bin.000001 # Table_map # # table_id: # (test.t3)
87-
master-bin.000001 # Table_map # # table_id: # (test.t5)
8887
master-bin.000001 # Table_map # # table_id: # (test.t4)
88+
master-bin.000001 # Table_map # # table_id: # (test.t5)
8989
master-bin.000001 # Table_map # # table_id: # (test.t6)
9090
master-bin.000001 # Write_rows # # table_id: #
9191
master-bin.000001 # Write_rows # # table_id: #
@@ -174,8 +174,8 @@ master-bin.000001 # Write_rows # # table_id: #
174174
master-bin.000001 # Write_rows # # table_id: #
175175
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
176176
master-bin.000001 # Table_map # # table_id: # (test.t3)
177-
master-bin.000001 # Table_map # # table_id: # (test.t5)
178177
master-bin.000001 # Table_map # # table_id: # (test.t4)
178+
master-bin.000001 # Table_map # # table_id: # (test.t5)
179179
master-bin.000001 # Table_map # # table_id: # (test.t6)
180180
master-bin.000001 # Write_rows # # table_id: #
181181
master-bin.000001 # Write_rows # # table_id: #
@@ -202,8 +202,8 @@ master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
202202
master-bin.000001 # Xid # # COMMIT /* XID */
203203
master-bin.000001 # Query # # BEGIN
204204
master-bin.000001 # Table_map # # table_id: # (test.t3)
205-
master-bin.000001 # Table_map # # table_id: # (test.t5)
206205
master-bin.000001 # Table_map # # table_id: # (test.t4)
206+
master-bin.000001 # Table_map # # table_id: # (test.t5)
207207
master-bin.000001 # Table_map # # table_id: # (test.t6)
208208
master-bin.000001 # Write_rows # # table_id: #
209209
master-bin.000001 # Write_rows # # table_id: #
@@ -294,8 +294,8 @@ master-bin.000001 # Write_rows # # table_id: #
294294
master-bin.000001 # Update_rows # # table_id: #
295295
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
296296
master-bin.000001 # Table_map # # table_id: # (test.t3)
297-
master-bin.000001 # Table_map # # table_id: # (test.t5)
298297
master-bin.000001 # Table_map # # table_id: # (test.t4)
298+
master-bin.000001 # Table_map # # table_id: # (test.t5)
299299
master-bin.000001 # Table_map # # table_id: # (test.t6)
300300
master-bin.000001 # Update_rows # # table_id: #
301301
master-bin.000001 # Write_rows # # table_id: #
@@ -326,8 +326,8 @@ master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
326326
master-bin.000001 # Xid # # COMMIT /* XID */
327327
master-bin.000001 # Query # # BEGIN
328328
master-bin.000001 # Table_map # # table_id: # (test.t3)
329-
master-bin.000001 # Table_map # # table_id: # (test.t5)
330329
master-bin.000001 # Table_map # # table_id: # (test.t4)
330+
master-bin.000001 # Table_map # # table_id: # (test.t5)
331331
master-bin.000001 # Table_map # # table_id: # (test.t6)
332332
master-bin.000001 # Update_rows # # table_id: #
333333
master-bin.000001 # Write_rows # # table_id: #
@@ -412,8 +412,8 @@ master-bin.000001 # Update_rows # # table_id: #
412412
master-bin.000001 # Write_rows # # table_id: #
413413
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
414414
master-bin.000001 # Table_map # # table_id: # (test.t3)
415-
master-bin.000001 # Table_map # # table_id: # (test.t5)
416415
master-bin.000001 # Table_map # # table_id: # (test.t4)
416+
master-bin.000001 # Table_map # # table_id: # (test.t5)
417417
master-bin.000001 # Table_map # # table_id: # (test.t6)
418418
master-bin.000001 # Write_rows # # table_id: #
419419
master-bin.000001 # Write_rows # # table_id: #
@@ -444,8 +444,8 @@ master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
444444
master-bin.000001 # Xid # # COMMIT /* XID */
445445
master-bin.000001 # Query # # BEGIN
446446
master-bin.000001 # Table_map # # table_id: # (test.t3)
447-
master-bin.000001 # Table_map # # table_id: # (test.t5)
448447
master-bin.000001 # Table_map # # table_id: # (test.t4)
448+
master-bin.000001 # Table_map # # table_id: # (test.t5)
449449
master-bin.000001 # Table_map # # table_id: # (test.t6)
450450
master-bin.000001 # Write_rows # # table_id: #
451451
master-bin.000001 # Write_rows # # table_id: #
@@ -532,8 +532,8 @@ master-bin.000001 # Write_rows # # table_id: #
532532
master-bin.000001 # Delete_rows # # table_id: #
533533
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
534534
master-bin.000001 # Table_map # # table_id: # (test.t3)
535-
master-bin.000001 # Table_map # # table_id: # (test.t5)
536535
master-bin.000001 # Table_map # # table_id: # (test.t4)
536+
master-bin.000001 # Table_map # # table_id: # (test.t5)
537537
master-bin.000001 # Table_map # # table_id: # (test.t6)
538538
master-bin.000001 # Delete_rows # # table_id: #
539539
master-bin.000001 # Write_rows # # table_id: #
@@ -568,8 +568,8 @@ master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
568568
master-bin.000001 # Xid # # COMMIT /* XID */
569569
master-bin.000001 # Query # # BEGIN
570570
master-bin.000001 # Table_map # # table_id: # (test.t3)
571-
master-bin.000001 # Table_map # # table_id: # (test.t5)
572571
master-bin.000001 # Table_map # # table_id: # (test.t4)
572+
master-bin.000001 # Table_map # # table_id: # (test.t5)
573573
master-bin.000001 # Table_map # # table_id: # (test.t6)
574574
master-bin.000001 # Delete_rows # # table_id: #
575575
master-bin.000001 # Write_rows # # table_id: #
@@ -650,8 +650,8 @@ master-bin.000001 # Delete_rows # # table_id: #
650650
master-bin.000001 # Write_rows # # table_id: #
651651
master-bin.000001 # Delete_rows # # table_id: # flags: STMT_END_F
652652
master-bin.000001 # Table_map # # table_id: # (test.t3)
653-
master-bin.000001 # Table_map # # table_id: # (test.t5)
654653
master-bin.000001 # Table_map # # table_id: # (test.t4)
654+
master-bin.000001 # Table_map # # table_id: # (test.t5)
655655
master-bin.000001 # Table_map # # table_id: # (test.t6)
656656
master-bin.000001 # Write_rows # # table_id: #
657657
master-bin.000001 # Write_rows # # table_id: #
@@ -686,8 +686,8 @@ master-bin.000001 # Delete_rows # # table_id: # flags: STMT_END_F
686686
master-bin.000001 # Xid # # COMMIT /* XID */
687687
master-bin.000001 # Query # # BEGIN
688688
master-bin.000001 # Table_map # # table_id: # (test.t3)
689-
master-bin.000001 # Table_map # # table_id: # (test.t5)
690689
master-bin.000001 # Table_map # # table_id: # (test.t4)
690+
master-bin.000001 # Table_map # # table_id: # (test.t5)
691691
master-bin.000001 # Table_map # # table_id: # (test.t6)
692692
master-bin.000001 # Write_rows # # table_id: #
693693
master-bin.000001 # Write_rows # # table_id: #

0 commit comments

Comments
 (0)