Skip to content

Commit dbd655d

Browse files
thayumanavar77thayumanavar77
committed
BUG#18221750 - BACKPORT BUG#14765080 TO 5.6
This is a backport of the BUG#14765080.
1 parent 1a43870 commit dbd655d

File tree

9 files changed

+385
-87
lines changed

9 files changed

+385
-87
lines changed

‎mysql-test/r/debug_sync.result‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SET DEBUG_SYNC= 'RESET';
22
DROP TABLE IF EXISTS t1;
33
SHOW VARIABLES LIKE 'DEBUG_SYNC';
44
Variable_name Value
5-
debug_sync ON - current signal: ''
5+
debug_sync ON - signals: ''
66
SET DEBUG_SYNC='p0 SIGNAL s1 WAIT_FOR s2 TIMEOUT 6 EXECUTE 2 HIT_LIMIT 3';
77
SET DEBUG_SYNC='p0 SIGNAL s1 WAIT_FOR s2 TIMEOUT 6 EXECUTE 2';
88
SET DEBUG_SYNC='p0 SIGNAL s1 WAIT_FOR s2 TIMEOUT 6 HIT_LIMIT 3';
@@ -150,34 +150,34 @@ SET @myvar= 'now SIGNAL from_myvar';
150150
SET DEBUG_SYNC= @myvar;
151151
SHOW VARIABLES LIKE 'DEBUG_SYNC';
152152
Variable_name Value
153-
debug_sync ON - current signal: 'from_myvar'
153+
debug_sync ON - signals: 'from_myvar'
154154
SET DEBUG_SYNC= LEFT('now SIGNAL from_function_cut_here', 24);
155155
SHOW VARIABLES LIKE 'DEBUG_SYNC';
156156
Variable_name Value
157-
debug_sync ON - current signal: 'from_function'
157+
debug_sync ON - signals: 'from_function,from_myvar'
158158
SET DEBUG_SYNC= 'now SIGNAL something';
159159
SHOW VARIABLES LIKE 'DEBUG_SYNC';
160160
Variable_name Value
161-
debug_sync ON - current signal: 'something'
161+
debug_sync ON - signals: 'from_function,from_myvar,something'
162162
SET DEBUG_SYNC= 'now WAIT_FOR nothing TIMEOUT 0';
163163
Warnings:
164164
Warning #### debug sync point wait timed out
165165
SET DEBUG_SYNC= 'now SIGNAL nothing';
166166
SHOW VARIABLES LIKE 'DEBUG_SYNC';
167167
Variable_name Value
168-
debug_sync ON - current signal: 'nothing'
168+
debug_sync ON - signals: 'from_function,from_myvar,nothing,something'
169169
SET DEBUG_SYNC= 'now WAIT_FOR nothing TIMEOUT 0';
170170
SET DEBUG_SYNC= 'now SIGNAL something EXECUTE 0';
171171
SHOW VARIABLES LIKE 'DEBUG_SYNC';
172172
Variable_name Value
173-
debug_sync ON - current signal: 'nothing'
173+
debug_sync ON - signals: 'from_function,from_myvar,something'
174174
SET DEBUG_SYNC= 'now WAIT_FOR anotherthing TIMEOUT 0 EXECUTE 0';
175175
SET DEBUG_SYNC= 'now HIT_LIMIT 1';
176176
ERROR HY000: debug sync point hit limit reached
177177
SET DEBUG_SYNC= 'RESET';
178178
SHOW VARIABLES LIKE 'DEBUG_SYNC';
179179
Variable_name Value
180-
debug_sync ON - current signal: ''
180+
debug_sync ON - signals: ''
181181
SET DEBUG_SYNC= 'p1abcd SIGNAL s1 EXECUTE 2';
182182
SET DEBUG_SYNC= 'p2abc SIGNAL s2 EXECUTE 2';
183183
SET DEBUG_SYNC= 'p9abcdef SIGNAL s9 EXECUTE 2';
@@ -190,23 +190,23 @@ SET DEBUG_SYNC= 'p3abcdef SIGNAL s3 EXECUTE 2';
190190
SET DEBUG_SYNC= 'p4a TEST';
191191
SHOW VARIABLES LIKE 'DEBUG_SYNC';
192192
Variable_name Value
193-
debug_sync ON - current signal: 's4'
193+
debug_sync ON - signals: 's4'
194194
SET DEBUG_SYNC= 'p1abcd TEST';
195195
SHOW VARIABLES LIKE 'DEBUG_SYNC';
196196
Variable_name Value
197-
debug_sync ON - current signal: 's1'
197+
debug_sync ON - signals: 's1,s4'
198198
SET DEBUG_SYNC= 'p7 TEST';
199199
SHOW VARIABLES LIKE 'DEBUG_SYNC';
200200
Variable_name Value
201-
debug_sync ON - current signal: 's7'
201+
debug_sync ON - signals: 's1,s4,s7'
202202
SET DEBUG_SYNC= 'p9abcdef TEST';
203203
SHOW VARIABLES LIKE 'DEBUG_SYNC';
204204
Variable_name Value
205-
debug_sync ON - current signal: 's9'
205+
debug_sync ON - signals: 's1,s4,s7,s9'
206206
SET DEBUG_SYNC= 'p3abcdef TEST';
207207
SHOW VARIABLES LIKE 'DEBUG_SYNC';
208208
Variable_name Value
209-
debug_sync ON - current signal: 's3'
209+
debug_sync ON - signals: 's1,s3,s4,s7,s9'
210210
SET DEBUG_SYNC= 'p1abcd CLEAR';
211211
SET DEBUG_SYNC= 'p2abc CLEAR';
212212
SET DEBUG_SYNC= 'p5abcde CLEAR';
@@ -219,19 +219,19 @@ SET DEBUG_SYNC= 'p7 CLEAR';
219219
SET DEBUG_SYNC= 'p1abcd TEST';
220220
SHOW VARIABLES LIKE 'DEBUG_SYNC';
221221
Variable_name Value
222-
debug_sync ON - current signal: 's3'
222+
debug_sync ON - signals: 's1,s3,s4,s7,s9'
223223
SET DEBUG_SYNC= 'p7 TEST';
224224
SHOW VARIABLES LIKE 'DEBUG_SYNC';
225225
Variable_name Value
226-
debug_sync ON - current signal: 's3'
226+
debug_sync ON - signals: 's1,s3,s4,s7,s9'
227227
SET DEBUG_SYNC= 'p9abcdef TEST';
228228
SHOW VARIABLES LIKE 'DEBUG_SYNC';
229229
Variable_name Value
230-
debug_sync ON - current signal: 's3'
230+
debug_sync ON - signals: 's1,s3,s4,s7,s9'
231231
SET DEBUG_SYNC= 'RESET';
232232
SHOW VARIABLES LIKE 'DEBUG_SYNC';
233233
Variable_name Value
234-
debug_sync ON - current signal: ''
234+
debug_sync ON - signals: ''
235235
CREATE USER mysqltest_1@localhost;
236236
GRANT SUPER ON *.* TO mysqltest_1@localhost;
237237
connection con1, mysqltest_1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SET @debug_save= @@GLOBAL.DEBUG;
88
SET GLOBAL rpl_semi_sync_master_timeout= 600000;
99
include/sync_slave_sql_with_master.inc
1010
SET GLOBAL debug= 'd,semi_sync_3-way_deadlock';
11-
SET DEBUG_SYNC= "before_process_commit_stage_queue WAIT_FOR signal.rotate_finished";
11+
SET DEBUG_SYNC= "before_process_commit_stage_queue WAIT_FOR signal.rotate_finished no_clear_event";
1212
# Build 10 connections to master server
1313
# Execute INSERT statement on these 10 connections in parallel
1414
SET DEBUG_SYNC= "before_rotate_binlog SIGNAL signal.rotate_finished";

‎mysql-test/suite/rpl/t/rpl_semi_sync_deadlock.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ while ($i < $n)
2727

2828
--connection master
2929
SET GLOBAL debug= 'd,semi_sync_3-way_deadlock';
30-
SET DEBUG_SYNC= "before_process_commit_stage_queue WAIT_FOR signal.rotate_finished";
30+
SET DEBUG_SYNC= "before_process_commit_stage_queue WAIT_FOR signal.rotate_finished no_clear_event";
3131

3232
--echo # Build 10 connections to master server
3333
--disable_query_log

‎mysql-test/suite/sys_vars/r/debug_sync_basic.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ select @@global.debug_sync;
22
ERROR HY000: Variable 'debug_sync' is a SESSION variable
33
select @@session.debug_sync;
44
@@session.debug_sync
5-
ON - current signal: ''
5+
ON - signals: ''
66
show global variables like "debug_sync";
77
Variable_name Value
88
show session variables like "debug_sync";
99
Variable_name Value
10-
debug_sync ON - current signal: ''
10+
debug_sync ON - signals: ''
1111
select * from information_schema.global_variables where variable_name="debug_sync";
1212
VARIABLE_NAME VARIABLE_VALUE
1313
select * from information_schema.session_variables where variable_name="debug_sync";
1414
VARIABLE_NAME VARIABLE_VALUE
15-
DEBUG_SYNC ON - current signal: ''
15+
DEBUG_SYNC ON - signals: ''
1616
set @@session.debug_sync=1;
1717
ERROR 42000: Incorrect argument type to variable 'debug_sync'
1818
set @@session.debug_sync=1.1;

0 commit comments

Comments
 (0)