Skip to content

Commit 5b1738c

Browse files
author
Pavan Naik
committed
BUG#26966008: MTR: ENABLE CHECK-TESTCASES FOR TESTS SOURCING
 'FORCE_RESTART_IF_SKIPPED.INC' Post push fix, fixed GR test failures which need --big-test option to run. Reviewed-by: Narendra Chauhan <[email protected]>
1 parent 6a1e64d commit 5b1738c

6 files changed

+24
-12
lines changed

‎rapid/plugin/group_replication/tests/mtr/r/gr_concurrent_events_insert_with_select.result

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ include/rpl_sync.inc
1212
#
1313
# Create the events in each member.
1414
#
15+
SET @old_event_scheduler= @@global.event_scheduler;
1516
SET SESSION sql_log_bin= 0;
1617
SET GLOBAL event_scheduler=on|
1718
CREATE EVENT IF NOT EXISTS test.event1
@@ -36,6 +37,7 @@ END WHILE;
3637
END|
3738
SET SESSION sql_log_bin= 1;
3839
[connection server2]
40+
SET @old_event_scheduler= @@global.event_scheduler;
3941
SET SESSION sql_log_bin= 0;
4042
SET GLOBAL event_scheduler=on|
4143
CREATE EVENT IF NOT EXISTS test.event2
@@ -60,6 +62,7 @@ END WHILE;
6062
END|
6163
SET SESSION sql_log_bin= 1;
6264
[connection server3]
65+
SET @old_event_scheduler= @@global.event_scheduler;
6366
SET SESSION sql_log_bin= 0;
6467
SET GLOBAL event_scheduler=on|
6568
CREATE EVENT IF NOT EXISTS test.event3
@@ -123,17 +126,17 @@ include/assert.inc ['The group replication applier channel is ON']
123126
SET SESSION sql_log_bin= 0;
124127
DROP EVENT IF EXISTS test.event1;
125128
SET SESSION sql_log_bin= 1;
126-
SET GLOBAL event_scheduler=off;
129+
SET GLOBAL event_scheduler= @old_event_scheduler;
127130
[connection server2]
128131
SET SESSION sql_log_bin= 0;
129132
DROP EVENT IF EXISTS test.event2;
130133
SET SESSION sql_log_bin= 1;
131-
SET GLOBAL event_scheduler=off;
134+
SET GLOBAL event_scheduler= @old_event_scheduler;
132135
[connection server3]
133136
SET SESSION sql_log_bin= 0;
134137
DROP EVENT IF EXISTS test.event3;
135138
SET SESSION sql_log_bin= 1;
136-
SET GLOBAL event_scheduler=off;
139+
SET GLOBAL event_scheduler= @old_event_scheduler;
137140
[connection server1]
138141
DROP TABLE t1;
139142
include/group_replication_end.inc

‎rapid/plugin/group_replication/tests/mtr/r/gr_large_view_change_event_size.result

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,13 @@ END WHILE;
6262
END//
6363
SET SESSION sql_log_bin= 1;
6464
[connection server1]
65+
SET @old_event_scheduler= @@global.event_scheduler;
6566
SET GLOBAL event_scheduler=on;
6667
SET SESSION sql_log_bin= 0;
6768
ALTER EVENT event1 ENABLE;
6869
SET SESSION sql_log_bin= 1;
6970
[connection server2]
71+
SET @old_event_scheduler= @@global.event_scheduler;
7072
SET GLOBAL event_scheduler=on;
7173
SET SESSION sql_log_bin= 0;
7274
ALTER EVENT event2 ENABLE;
@@ -95,15 +97,15 @@ SET SESSION sql_log_bin= 0;
9597
ALTER EVENT event1 DISABLE;
9698
DROP EVENT IF EXISTS test.event1;
9799
SET SESSION sql_log_bin= 1;
98-
SET GLOBAL event_scheduler=off;
100+
SET GLOBAL event_scheduler= @old_event_scheduler;
99101
SET @@GLOBAL.DEBUG= '-d,group_replication_certifier_broadcast_thread_big_period';
100102
SET @@global.max_allowed_packet = @start_global_value_s1;
101103
[connection server2]
102104
SET SESSION sql_log_bin= 0;
103105
ALTER EVENT event2 DISABLE;
104106
DROP EVENT IF EXISTS test.event2;
105107
SET SESSION sql_log_bin= 1;
106-
SET GLOBAL event_scheduler=off;
108+
SET GLOBAL event_scheduler= @old_event_scheduler;
107109
SET @@GLOBAL.DEBUG= '-d,group_replication_certifier_broadcast_thread_big_period';
108110
SET @@global.max_allowed_packet = @start_global_value_s2;
109111
[connection server1]

‎rapid/plugin/group_replication/tests/mtr/r/gr_recovery_no_donors.result

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ call mtr.add_suppression("Transaction cannot be executed while Group Replication
2222
call mtr.add_suppression("Run function 'before_commit' in plugin 'group_replication' failed");
2323
SET SESSION sql_log_bin= 1;
2424
CREATE TABLE t1 (a INT PRIMARY KEY AUTO_INCREMENT NOT NULL);
25+
SET @old_event_scheduler= @@global.event_scheduler;
2526
SET GLOBAL EVENT_SCHEDULER= ON;
2627
CREATE EVENT IF NOT EXISTS e1
2728
ON SCHEDULE
@@ -109,7 +110,7 @@ include/stop_group_replication.inc
109110
SET GLOBAL group_replication_recovery_reconnect_interval= @group_replication_recovery_reconnect_interval_save;
110111
SET GLOBAL group_replication_allow_local_disjoint_gtids_join= @group_replication_allow_local_disjoint_gtids_join_save;
111112
ALTER EVENT e1 DISABLE;
112-
SET GLOBAL EVENT_SCHEDULER= OFF;
113+
SET GLOBAL EVENT_SCHEDULER= @old_event_scheduler;
113114
DROP EVENT e1;
114115
DROP TABLE t1;
115116
[connection server2]

‎rapid/plugin/group_replication/tests/mtr/t/gr_concurrent_events_insert_with_select.test

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ CREATE TABLE IF NOT EXISTS t1 (a INT PRIMARY KEY);
2222
--echo # Create the events in each member.
2323
--echo #
2424

25+
SET @old_event_scheduler= @@global.event_scheduler;
2526
SET SESSION sql_log_bin= 0;
2627
delimiter |;
2728

@@ -54,6 +55,7 @@ SET SESSION sql_log_bin= 1;
5455
--let $rpl_connection_name= server2
5556
--source include/rpl_connection.inc
5657

58+
SET @old_event_scheduler= @@global.event_scheduler;
5759
SET SESSION sql_log_bin= 0;
5860
delimiter |;
5961

@@ -86,6 +88,7 @@ SET SESSION sql_log_bin= 1;
8688
--let $rpl_connection_name= server3
8789
--source include/rpl_connection.inc
8890

91+
SET @old_event_scheduler= @@global.event_scheduler;
8992
SET SESSION sql_log_bin= 0;
9093
delimiter |;
9194

@@ -202,7 +205,7 @@ SET SESSION sql_log_bin= 0;
202205
DROP EVENT IF EXISTS test.event1;
203206
SET SESSION sql_log_bin= 1;
204207

205-
SET GLOBAL event_scheduler=off;
208+
SET GLOBAL event_scheduler= @old_event_scheduler;
206209

207210
--let $rpl_connection_name= server2
208211
--source include/rpl_connection.inc
@@ -211,7 +214,7 @@ SET SESSION sql_log_bin= 0;
211214
DROP EVENT IF EXISTS test.event2;
212215
SET SESSION sql_log_bin= 1;
213216

214-
SET GLOBAL event_scheduler=off;
217+
SET GLOBAL event_scheduler= @old_event_scheduler;
215218

216219
--let $rpl_connection_name= server3
217220
--source include/rpl_connection.inc
@@ -220,7 +223,7 @@ SET SESSION sql_log_bin= 0;
220223
DROP EVENT IF EXISTS test.event3;
221224
SET SESSION sql_log_bin= 1;
222225

223-
SET GLOBAL event_scheduler=off;
226+
SET GLOBAL event_scheduler= @old_event_scheduler;
224227

225228
--let $rpl_connection_name= server1
226229
--source include/rpl_connection.inc

‎rapid/plugin/group_replication/tests/mtr/t/gr_large_view_change_event_size.test

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ SET SESSION sql_log_bin= 1;
120120
--let $rpl_connection_name= server1
121121
--source include/rpl_connection.inc
122122

123+
SET @old_event_scheduler= @@global.event_scheduler;
123124
SET GLOBAL event_scheduler=on;
124125
SET SESSION sql_log_bin= 0;
125126
ALTER EVENT event1 ENABLE;
@@ -128,6 +129,7 @@ SET SESSION sql_log_bin= 1;
128129
--let $rpl_connection_name= server2
129130
--source include/rpl_connection.inc
130131

132+
SET @old_event_scheduler= @@global.event_scheduler;
131133
SET GLOBAL event_scheduler=on;
132134
SET SESSION sql_log_bin= 0;
133135
ALTER EVENT event2 ENABLE;
@@ -193,7 +195,7 @@ ALTER EVENT event1 DISABLE;
193195
DROP EVENT IF EXISTS test.event1;
194196
SET SESSION sql_log_bin= 1;
195197

196-
SET GLOBAL event_scheduler=off;
198+
SET GLOBAL event_scheduler= @old_event_scheduler;
197199
SET @@GLOBAL.DEBUG= '-d,group_replication_certifier_broadcast_thread_big_period';
198200
SET @@global.max_allowed_packet = @start_global_value_s1;
199201

@@ -209,7 +211,7 @@ ALTER EVENT event2 DISABLE;
209211
DROP EVENT IF EXISTS test.event2;
210212
SET SESSION sql_log_bin= 1;
211213

212-
SET GLOBAL event_scheduler=off;
214+
SET GLOBAL event_scheduler= @old_event_scheduler;
213215
SET @@GLOBAL.DEBUG= '-d,group_replication_certifier_broadcast_thread_big_period';
214216
SET @@global.max_allowed_packet = @start_global_value_s2;
215217

‎rapid/plugin/group_replication/tests/mtr/t/gr_recovery_no_donors.test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ call mtr.add_suppression("Run function 'before_commit' in plugin 'group_replicat
4343
SET SESSION sql_log_bin= 1;
4444

4545
CREATE TABLE t1 (a INT PRIMARY KEY AUTO_INCREMENT NOT NULL);
46+
SET @old_event_scheduler= @@global.event_scheduler;
4647
SET GLOBAL EVENT_SCHEDULER= ON;
4748
delimiter //;
4849
CREATE EVENT IF NOT EXISTS e1
@@ -172,7 +173,7 @@ SET GLOBAL group_replication_allow_local_disjoint_gtids_join= @group_replication
172173
ALTER EVENT e1 DISABLE;
173174
--let $wait_condition= SELECT status="DISABLED" FROM information_schema.events WHERE event_schema='test' AND event_name="e1"
174175
--source include/wait_condition_or_abort.inc
175-
SET GLOBAL EVENT_SCHEDULER= OFF;
176+
SET GLOBAL EVENT_SCHEDULER= @old_event_scheduler;
176177
DROP EVENT e1;
177178
DROP TABLE t1;
178179

0 commit comments

Comments
 (0)