Skip to content

Commit 7b9b868

Browse files
author
Parveez Baig
committed
Bug #19071401 : BIG TESTS TIME OUT ON HUDSON: RPLMIXING_ENGINES AND RPLCRASH_SAFE
The tests were getting timeout specially on windows due to many show_binlog_events.inc involved in the tests. All these tests will finally call rpl_mixing_engines.test which sources rpl_mixing_engines.inc file where the main operations are done and the File show_binlog_events.inc is called. Fix: Replaced the File show_binlog_events.inc with the query show binlog events with some column masking and the regex replacements needed for the tests result file to be same. Removed the include file big_test.inc from the rplmixing_engines tests as these tests are taking less time after the fix.
1 parent 0292609 commit 7b9b868

22 files changed

+13456
-11895
lines changed

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

+15-7
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,23 @@
2424
# database is created or dropped, respectively.
2525
#
2626
# $verbose
27-
# By default, show_binlog_events.inc is sourced after all
27+
# By default, the query show binlog events is executed after all
2828
# commands have been processed, showing the result of all
29-
# commands. If this flag is set, then show_binlog_events.inc is
30-
# also sourced once after each command, showing only the result
29+
# commands. If this flag is set, then the query show binlog events
30+
# is also executed once after each command, showing only the result
3131
# of that command.
3232
--echo rpl_mixing_engines.inc [commands=$commands]
3333

3434
--let $rme_initial_commands= $commands
3535

3636
if ($commands == 'configure')
3737
{
38+
let $binlog_filter=
39+
/Anonymous_Gtid/Gtid/
40+
/GTID_NEXT= '([0-9a-f:\-]+|ANONYMOUS)'/GTID_NEXT= Gtid_set/
41+
/xid=[0-9]+/XID/
42+
/table_id: [0-9]+/table_id: #/;
3843
connection master;
39-
4044
--disable_query_log
4145
if ($database_name != 'test')
4246
{
@@ -609,12 +613,14 @@ while ($commands != '')
609613
let $binlog_start= $pos_command;
610614
if ($verbose)
611615
{
612-
# Use other connection because include/show_binlog_events.inc
616+
# Use other connection because query show binlog events
613617
# executes SELECT UUID(), which switches to row-logging when
614618
# binlog_format=mixed, if there are open temporary tables. This is
615619
# due to BUG#13692513.
616620
--connection server_1
617-
--source include/show_binlog_events.inc
621+
replace_column 2 # 4 # 5 #;
622+
--replace_regex $binlog_filter
623+
eval show binlog events from $binlog_start;
618624
--connection master
619625
--echo -e-e-e-e-e-e-e-e-e-e-e- >> $command << -e-e-e-e-e-e-e-e-e-e-e-
620626
}
@@ -623,7 +629,9 @@ while ($commands != '')
623629
let $binlog_start= $pos_trans_command;
624630
--echo -b-b-b-b-b-b-b-b-b-b-b- >> $rme_initial_commands << -b-b-b-b-b-b-b-b-b-b-b-
625631
--connection server_1
626-
--source include/show_binlog_events.inc
632+
replace_column 2 # 4 # 5 #;
633+
--replace_regex $binlog_filter
634+
eval show binlog events from $binlog_start;
627635
--connection master
628636
--echo -e-e-e-e-e-e-e-e-e-e-e- >> $rme_initial_commands << -e-e-e-e-e-e-e-e-e-e-e-
629637
--echo

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

+1,999-1,729
Large diffs are not rendered by default.

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

+1,999-1,729
Large diffs are not rendered by default.

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

+2,031-1,729
Large diffs are not rendered by default.

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

+1,902-1,729
Large diffs are not rendered by default.

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

+166-158
Large diffs are not rendered by default.

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

+2,031-1,729
Large diffs are not rendered by default.

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

+234-234
Large diffs are not rendered by default.

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

+234-234
Large diffs are not rendered by default.

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

+166-158
Large diffs are not rendered by default.

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

+234-234
Large diffs are not rendered by default.

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

+234-234
Large diffs are not rendered by default.

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

+234-234
Large diffs are not rendered by default.

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

+16-16
Original file line numberDiff line numberDiff line change
@@ -569,8 +569,8 @@ INSERT INTO tt_1(trans_id, stmt_id) VALUES (7, 2);
569569
INSERT INTO tt_1(trans_id, stmt_id) VALUES (7, 4);
570570
COMMIT;
571571
-b-b-b-b-b-b-b-b-b-b-b- >> B T T C << -b-b-b-b-b-b-b-b-b-b-b-
572-
include/show_binlog_events.inc
573572
Log_name Pos Event_type Server_id End_log_pos Info
573+
master-bin.000001 # Gtid # # SET @@SESSION.GTID_NEXT= Gtid_set
574574
master-bin.000001 # Query # # BEGIN
575575
master-bin.000001 # Query # # use `test_1`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (7, 2)
576576
master-bin.000001 # Query # # use `test_1`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (7, 4)
@@ -586,8 +586,8 @@ INSERT INTO tt_1(trans_id, stmt_id) VALUES (8, 2);
586586
INSERT INTO tt_1(trans_id, stmt_id) VALUES (8, 4);
587587
COMMIT;
588588
-b-b-b-b-b-b-b-b-b-b-b- >> B T T C << -b-b-b-b-b-b-b-b-b-b-b-
589-
include/show_binlog_events.inc
590589
Log_name Pos Event_type Server_id End_log_pos Info
590+
master-bin.000001 # Gtid # # SET @@SESSION.GTID_NEXT= Gtid_set
591591
master-bin.000001 # Query # # BEGIN
592592
master-bin.000001 # Query # # use `test_2`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (8, 2)
593593
master-bin.000001 # Query # # use `test_2`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (8, 4)
@@ -603,8 +603,8 @@ INSERT INTO tt_1(trans_id, stmt_id) VALUES (9, 2);
603603
INSERT INTO tt_1(trans_id, stmt_id) VALUES (9, 4);
604604
COMMIT;
605605
-b-b-b-b-b-b-b-b-b-b-b- >> B T T C << -b-b-b-b-b-b-b-b-b-b-b-
606-
include/show_binlog_events.inc
607606
Log_name Pos Event_type Server_id End_log_pos Info
607+
master-bin.000001 # Gtid # # SET @@SESSION.GTID_NEXT= Gtid_set
608608
master-bin.000001 # Query # # BEGIN
609609
master-bin.000001 # Query # # use `test_3`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (9, 2)
610610
master-bin.000001 # Query # # use `test_3`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (9, 4)
@@ -620,8 +620,8 @@ INSERT INTO tt_1(trans_id, stmt_id) VALUES (10, 2);
620620
INSERT INTO tt_1(trans_id, stmt_id) VALUES (10, 4);
621621
COMMIT;
622622
-b-b-b-b-b-b-b-b-b-b-b- >> B T T C << -b-b-b-b-b-b-b-b-b-b-b-
623-
include/show_binlog_events.inc
624623
Log_name Pos Event_type Server_id End_log_pos Info
624+
master-bin.000001 # Gtid # # SET @@SESSION.GTID_NEXT= Gtid_set
625625
master-bin.000001 # Query # # BEGIN
626626
master-bin.000001 # Query # # use `test_4`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (10, 2)
627627
master-bin.000001 # Query # # use `test_4`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (10, 4)
@@ -637,8 +637,8 @@ INSERT INTO tt_1(trans_id, stmt_id) VALUES (11, 2);
637637
INSERT INTO tt_1(trans_id, stmt_id) VALUES (11, 4);
638638
COMMIT;
639639
-b-b-b-b-b-b-b-b-b-b-b- >> B T T C << -b-b-b-b-b-b-b-b-b-b-b-
640-
include/show_binlog_events.inc
641640
Log_name Pos Event_type Server_id End_log_pos Info
641+
master-bin.000001 # Gtid # # SET @@SESSION.GTID_NEXT= Gtid_set
642642
master-bin.000001 # Query # # BEGIN
643643
master-bin.000001 # Query # # use `test_1`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (11, 2)
644644
master-bin.000001 # Query # # use `test_1`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (11, 4)
@@ -654,8 +654,8 @@ INSERT INTO tt_1(trans_id, stmt_id) VALUES (12, 2);
654654
INSERT INTO tt_1(trans_id, stmt_id) VALUES (12, 4);
655655
COMMIT;
656656
-b-b-b-b-b-b-b-b-b-b-b- >> B T T C << -b-b-b-b-b-b-b-b-b-b-b-
657-
include/show_binlog_events.inc
658657
Log_name Pos Event_type Server_id End_log_pos Info
658+
master-bin.000001 # Gtid # # SET @@SESSION.GTID_NEXT= Gtid_set
659659
master-bin.000001 # Query # # BEGIN
660660
master-bin.000001 # Query # # use `test_2`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (12, 2)
661661
master-bin.000001 # Query # # use `test_2`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (12, 4)
@@ -671,8 +671,8 @@ INSERT INTO tt_1(trans_id, stmt_id) VALUES (13, 2);
671671
INSERT INTO tt_1(trans_id, stmt_id) VALUES (13, 4);
672672
COMMIT;
673673
-b-b-b-b-b-b-b-b-b-b-b- >> B T T C << -b-b-b-b-b-b-b-b-b-b-b-
674-
include/show_binlog_events.inc
675674
Log_name Pos Event_type Server_id End_log_pos Info
675+
master-bin.000001 # Gtid # # SET @@SESSION.GTID_NEXT= Gtid_set
676676
master-bin.000001 # Query # # BEGIN
677677
master-bin.000001 # Query # # use `test_3`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (13, 2)
678678
master-bin.000001 # Query # # use `test_3`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (13, 4)
@@ -688,8 +688,8 @@ INSERT INTO tt_1(trans_id, stmt_id) VALUES (14, 2);
688688
INSERT INTO tt_1(trans_id, stmt_id) VALUES (14, 4);
689689
COMMIT;
690690
-b-b-b-b-b-b-b-b-b-b-b- >> B T T C << -b-b-b-b-b-b-b-b-b-b-b-
691-
include/show_binlog_events.inc
692691
Log_name Pos Event_type Server_id End_log_pos Info
692+
master-bin.000001 # Gtid # # SET @@SESSION.GTID_NEXT= Gtid_set
693693
master-bin.000001 # Query # # BEGIN
694694
master-bin.000001 # Query # # use `test_4`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (14, 2)
695695
master-bin.000001 # Query # # use `test_4`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (14, 4)
@@ -705,8 +705,8 @@ INSERT INTO tt_1(trans_id, stmt_id) VALUES (15, 2);
705705
INSERT INTO tt_1(trans_id, stmt_id) VALUES (15, 4);
706706
COMMIT;
707707
-b-b-b-b-b-b-b-b-b-b-b- >> B T T C << -b-b-b-b-b-b-b-b-b-b-b-
708-
include/show_binlog_events.inc
709708
Log_name Pos Event_type Server_id End_log_pos Info
709+
master-bin.000001 # Gtid # # SET @@SESSION.GTID_NEXT= Gtid_set
710710
master-bin.000001 # Query # # BEGIN
711711
master-bin.000001 # Query # # use `test_1`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (15, 2)
712712
master-bin.000001 # Query # # use `test_1`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (15, 4)
@@ -722,8 +722,8 @@ INSERT INTO tt_1(trans_id, stmt_id) VALUES (16, 2);
722722
INSERT INTO tt_1(trans_id, stmt_id) VALUES (16, 4);
723723
COMMIT;
724724
-b-b-b-b-b-b-b-b-b-b-b- >> B T T C << -b-b-b-b-b-b-b-b-b-b-b-
725-
include/show_binlog_events.inc
726725
Log_name Pos Event_type Server_id End_log_pos Info
726+
master-bin.000001 # Gtid # # SET @@SESSION.GTID_NEXT= Gtid_set
727727
master-bin.000001 # Query # # BEGIN
728728
master-bin.000001 # Query # # use `test_2`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (16, 2)
729729
master-bin.000001 # Query # # use `test_2`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (16, 4)
@@ -739,8 +739,8 @@ INSERT INTO tt_1(trans_id, stmt_id) VALUES (17, 2);
739739
INSERT INTO tt_1(trans_id, stmt_id) VALUES (17, 4);
740740
COMMIT;
741741
-b-b-b-b-b-b-b-b-b-b-b- >> B T T C << -b-b-b-b-b-b-b-b-b-b-b-
742-
include/show_binlog_events.inc
743742
Log_name Pos Event_type Server_id End_log_pos Info
743+
master-bin.000001 # Gtid # # SET @@SESSION.GTID_NEXT= Gtid_set
744744
master-bin.000001 # Query # # BEGIN
745745
master-bin.000001 # Query # # use `test_3`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (17, 2)
746746
master-bin.000001 # Query # # use `test_3`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (17, 4)
@@ -756,8 +756,8 @@ INSERT INTO tt_1(trans_id, stmt_id) VALUES (18, 2);
756756
INSERT INTO tt_1(trans_id, stmt_id) VALUES (18, 4);
757757
COMMIT;
758758
-b-b-b-b-b-b-b-b-b-b-b- >> B T T C << -b-b-b-b-b-b-b-b-b-b-b-
759-
include/show_binlog_events.inc
760759
Log_name Pos Event_type Server_id End_log_pos Info
760+
master-bin.000001 # Gtid # # SET @@SESSION.GTID_NEXT= Gtid_set
761761
master-bin.000001 # Query # # BEGIN
762762
master-bin.000001 # Query # # use `test_4`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (18, 2)
763763
master-bin.000001 # Query # # use `test_4`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (18, 4)
@@ -773,8 +773,8 @@ INSERT INTO tt_1(trans_id, stmt_id) VALUES (19, 2);
773773
INSERT INTO tt_1(trans_id, stmt_id) VALUES (19, 4);
774774
COMMIT;
775775
-b-b-b-b-b-b-b-b-b-b-b- >> B T T C << -b-b-b-b-b-b-b-b-b-b-b-
776-
include/show_binlog_events.inc
777776
Log_name Pos Event_type Server_id End_log_pos Info
777+
master-bin.000001 # Gtid # # SET @@SESSION.GTID_NEXT= Gtid_set
778778
master-bin.000001 # Query # # BEGIN
779779
master-bin.000001 # Query # # use `test_1`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (19, 2)
780780
master-bin.000001 # Query # # use `test_1`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (19, 4)
@@ -790,8 +790,8 @@ INSERT INTO tt_1(trans_id, stmt_id) VALUES (20, 2);
790790
INSERT INTO tt_1(trans_id, stmt_id) VALUES (20, 4);
791791
COMMIT;
792792
-b-b-b-b-b-b-b-b-b-b-b- >> B T T C << -b-b-b-b-b-b-b-b-b-b-b-
793-
include/show_binlog_events.inc
794793
Log_name Pos Event_type Server_id End_log_pos Info
794+
master-bin.000001 # Gtid # # SET @@SESSION.GTID_NEXT= Gtid_set
795795
master-bin.000001 # Query # # BEGIN
796796
master-bin.000001 # Query # # use `test_2`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (20, 2)
797797
master-bin.000001 # Query # # use `test_2`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (20, 4)
@@ -807,8 +807,8 @@ INSERT INTO tt_1(trans_id, stmt_id) VALUES (21, 2);
807807
INSERT INTO tt_1(trans_id, stmt_id) VALUES (21, 4);
808808
COMMIT;
809809
-b-b-b-b-b-b-b-b-b-b-b- >> B T T C << -b-b-b-b-b-b-b-b-b-b-b-
810-
include/show_binlog_events.inc
811810
Log_name Pos Event_type Server_id End_log_pos Info
811+
master-bin.000001 # Gtid # # SET @@SESSION.GTID_NEXT= Gtid_set
812812
master-bin.000001 # Query # # BEGIN
813813
master-bin.000001 # Query # # use `test_3`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (21, 2)
814814
master-bin.000001 # Query # # use `test_3`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (21, 4)
@@ -824,8 +824,8 @@ INSERT INTO tt_1(trans_id, stmt_id) VALUES (22, 2);
824824
INSERT INTO tt_1(trans_id, stmt_id) VALUES (22, 4);
825825
COMMIT;
826826
-b-b-b-b-b-b-b-b-b-b-b- >> B T T C << -b-b-b-b-b-b-b-b-b-b-b-
827-
include/show_binlog_events.inc
828827
Log_name Pos Event_type Server_id End_log_pos Info
828+
master-bin.000001 # Gtid # # SET @@SESSION.GTID_NEXT= Gtid_set
829829
master-bin.000001 # Query # # BEGIN
830830
master-bin.000001 # Query # # use `test_4`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (22, 2)
831831
master-bin.000001 # Query # # use `test_4`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (22, 4)

0 commit comments

Comments
 (0)