Skip to content

Commit cbfd688

Browse files
dr-mdr-m
committed
Merge 5.5 into 10.1
2 parents 5ef1224 + ea61b79 commit cbfd688

27 files changed

+382
-366
lines changed

‎mysql-test/r/drop_bad_db_type.result

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
SET @save_dbug = @@debug_dbug;
12
set debug_dbug='+d,unstable_db_type';
23
install soname 'ha_archive';
34
create table t1 (a int) engine=archive;
@@ -30,4 +31,4 @@ t1.ARZ
3031
t1.frm
3132
drop table t1;
3233
uninstall soname 'ha_archive';
33-
set debug_dbug='-d,unstable_db_type';
34+
set debug_dbug=@save_dbug;

‎mysql-test/r/drop_debug.result

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
# -- Bug#43138: DROP DATABASE failure does not clean up message list.
44
# --
55

6-
DROP DATABASE IF EXISTS mysql_test;
7-
86
CREATE DATABASE mysql_test;
97
CREATE TABLE mysql_test.t1(a INT);
108
CREATE TABLE mysql_test.t2(b INT);
119
CREATE TABLE mysql_test.t3(c INT);
1210

11+
SET @save_dbug = @@debug_dbug;
1312
SET SESSION debug_dbug= "+d,bug43138";
1413

1514
DROP DATABASE mysql_test;
@@ -18,7 +17,7 @@ Error 1051 Unknown table 't1'
1817
Error 1051 Unknown table 't2'
1918
Error 1051 Unknown table 't3'
2019

21-
SET SESSION debug_dbug= "-d,bug43138";
20+
SET SESSION debug_dbug=@save_dbug;
2221

2322
# --
2423
# -- End of Bug#43138.

‎mysql-test/r/log_slow_debug.result

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ SET @@GLOBAL.log_output='TABLE';
66
FLUSH SLOW LOGS;
77
SET @@GLOBAL.slow_query_log=ON;
88
SET @@GLOBAL.log_slow_admin_statements=ON;
9+
SET @save_dbug = @@debug_dbug;
910
SET SESSION debug_dbug="+d,simulate_slow_query";
1011
CREATE PROCEDURE show_slow_log()
1112
BEGIN
@@ -129,7 +130,7 @@ sql_text
129130
#
130131
# Clean up
131132
#
132-
SET SESSION debug_dbug="-d,simulate_slow_query";
133+
SET SESSION debug_dbug=@save_dbug;
133134
TRUNCATE mysql.slow_log;
134135
SET @@global.slow_query_log= @org_slow_query_log;
135136
SET @@global.log_output= @org_log_output;

‎mysql-test/r/partition_debug_sync.result

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
DROP TABLE IF EXISTS t1, t2;
21
SET DEBUG_SYNC= 'RESET';
32
#
43
# Bug#42438: Crash ha_partition::change_table_ptr

‎mysql-test/r/sp-code.result

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -919,6 +919,7 @@ END;
919919
CLOSE c;
920920
SELECT a INTO @foo FROM t1 LIMIT 1; # Clear warning stack
921921
END|
922+
SET @save_dbug = @@debug_dbug;
922923
SET SESSION debug_dbug="+d,bug23032_emit_warning";
923924
CALL p1();
924925
Warning found!
@@ -938,7 +939,7 @@ End of Result Set found!
938939
Level Code Message
939940
Warning 1105 Unknown error
940941
Error 1329 No data - zero rows fetched, selected, or processed
941-
SET SESSION debug_dbug="-d,bug23032_emit_warning";
942+
SET SESSION debug_dbug=@save_dbug;
942943
DROP PROCEDURE p1;
943944
DROP TABLE t1;
944945
#

‎mysql-test/suite/parts/inc/partition_crash_add.inc

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
# To be used with partition mgm commands like
22
# ALTER TABLE t1 ADD PARTITION (LIST/RANGE PARTITIONING).
33
--echo # Crash testing ADD PARTITION
4+
SET @save_dbug=@@debug_dbug;
45
SET SESSION debug_dbug="+d,crash_add_partition_1";
56
--source suite/parts/inc/partition_crash.inc
6-
SET SESSION debug_dbug="-d,crash_add_partition_1";
7+
SET SESSION debug_dbug=@save_dbug;
78
SET SESSION debug_dbug="+d,crash_add_partition_2";
89
--source suite/parts/inc/partition_crash.inc
9-
SET SESSION debug_dbug="-d,crash_add_partition_2";
10+
SET SESSION debug_dbug=@save_dbug;
1011
SET SESSION debug_dbug="+d,crash_add_partition_3";
1112
--source suite/parts/inc/partition_crash.inc
12-
SET SESSION debug_dbug="-d,crash_add_partition_3";
13+
SET SESSION debug_dbug=@save_dbug;
1314
SET SESSION debug_dbug="+d,crash_add_partition_4";
1415
--source suite/parts/inc/partition_crash.inc
15-
SET SESSION debug_dbug="-d,crash_add_partition_4";
16+
SET SESSION debug_dbug=@save_dbug;
1617
SET SESSION debug_dbug="+d,crash_add_partition_5";
1718
--source suite/parts/inc/partition_crash.inc
18-
SET SESSION debug_dbug="-d,crash_add_partition_5";
19+
SET SESSION debug_dbug=@save_dbug;
1920
SET SESSION debug_dbug="+d,crash_add_partition_6";
2021
--source suite/parts/inc/partition_crash.inc
21-
SET SESSION debug_dbug="-d,crash_add_partition_6";
22+
SET SESSION debug_dbug=@save_dbug;
2223
SET SESSION debug_dbug="+d,crash_add_partition_7";
2324
--source suite/parts/inc/partition_crash.inc
24-
SET SESSION debug_dbug="-d,crash_add_partition_7";
25+
SET SESSION debug_dbug=@save_dbug;
2526
SET SESSION debug_dbug="+d,crash_add_partition_8";
2627
--source suite/parts/inc/partition_crash.inc
27-
SET SESSION debug_dbug="-d,crash_add_partition_8";
28+
SET SESSION debug_dbug=@save_dbug;
2829
SET SESSION debug_dbug="+d,crash_add_partition_9";
2930
--source suite/parts/inc/partition_crash.inc
30-
SET SESSION debug_dbug="-d,crash_add_partition_9";
31+
SET SESSION debug_dbug=@save_dbug;
3132
SET SESSION debug_dbug="+d,crash_add_partition_10";
3233
--source suite/parts/inc/partition_crash.inc
33-
SET SESSION debug_dbug="-d,crash_add_partition_10";
34+
SET SESSION debug_dbug=@save_dbug;

‎mysql-test/suite/parts/inc/partition_crash_change.inc

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,40 @@
22
# ALTER TABLE t1 COALESCE/REBUILD/REORGANIZE PARTITION.
33
--echo # Test change partition (REORGANIZE/REBUILD/COALESCE
44
--echo # or ADD HASH PARTITION).
5+
SET @save_dbug=@@debug_dbug;
56
SET SESSION debug_dbug="+d,crash_change_partition_1";
67
--source suite/parts/inc/partition_crash.inc
7-
SET SESSION debug_dbug="-d,crash_change_partition_1";
8+
SET SESSION debug_dbug=@save_dbug;
89
SET SESSION debug_dbug="+d,crash_change_partition_2";
910
--source suite/parts/inc/partition_crash.inc
10-
SET SESSION debug_dbug="-d,crash_change_partition_2";
11+
SET SESSION debug_dbug=@save_dbug;
1112
SET SESSION debug_dbug="+d,crash_change_partition_3";
1213
--source suite/parts/inc/partition_crash.inc
13-
SET SESSION debug_dbug="-d,crash_change_partition_3";
14+
SET SESSION debug_dbug=@save_dbug;
1415
SET SESSION debug_dbug="+d,crash_change_partition_4";
1516
--source suite/parts/inc/partition_crash.inc
16-
SET SESSION debug_dbug="-d,crash_change_partition_4";
17+
SET SESSION debug_dbug=@save_dbug;
1718
SET SESSION debug_dbug="+d,crash_change_partition_5";
1819
--source suite/parts/inc/partition_crash.inc
19-
SET SESSION debug_dbug="-d,crash_change_partition_5";
20+
SET SESSION debug_dbug=@save_dbug;
2021
SET SESSION debug_dbug="+d,crash_change_partition_6";
2122
--source suite/parts/inc/partition_crash.inc
22-
SET SESSION debug_dbug="-d,crash_change_partition_6";
23+
SET SESSION debug_dbug=@save_dbug;
2324
SET SESSION debug_dbug="+d,crash_change_partition_7";
2425
--source suite/parts/inc/partition_crash.inc
25-
SET SESSION debug_dbug="-d,crash_change_partition_7";
26+
SET SESSION debug_dbug=@save_dbug;
2627
SET SESSION debug_dbug="+d,crash_change_partition_8";
2728
--source suite/parts/inc/partition_crash.inc
28-
SET SESSION debug_dbug="-d,crash_change_partition_8";
29+
SET SESSION debug_dbug=@save_dbug;
2930
SET SESSION debug_dbug="+d,crash_change_partition_9";
3031
--source suite/parts/inc/partition_crash.inc
31-
SET SESSION debug_dbug="-d,crash_change_partition_9";
32+
SET SESSION debug_dbug=@save_dbug;
3233
SET SESSION debug_dbug="+d,crash_change_partition_10";
3334
--source suite/parts/inc/partition_crash.inc
34-
SET SESSION debug_dbug="-d,crash_change_partition_10";
35+
SET SESSION debug_dbug=@save_dbug;
3536
SET SESSION debug_dbug="+d,crash_change_partition_11";
3637
--source suite/parts/inc/partition_crash.inc
37-
SET SESSION debug_dbug="-d,crash_change_partition_11";
38+
SET SESSION debug_dbug=@save_dbug;
3839
SET SESSION debug_dbug="+d,crash_change_partition_12";
3940
--source suite/parts/inc/partition_crash.inc
40-
SET SESSION debug_dbug="-d,crash_change_partition_12";
41+
SET SESSION debug_dbug=@save_dbug;

‎mysql-test/suite/parts/inc/partition_crash_drop.inc

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11
# To be used with partition mgm commands like
22
# ALTER TABLE t1 DROP PARTITION.
33
--echo # Test DROP PARTITION
4+
SET @save_dbug=@@debug_dbug;
45
SET SESSION debug_dbug="+d,crash_drop_partition_1";
56
--source suite/parts/inc/partition_crash.inc
6-
SET SESSION debug_dbug="-d,crash_drop_partition_1";
7+
SET SESSION debug_dbug=@save_dbug;
78
SET SESSION debug_dbug="+d,crash_drop_partition_2";
89
--source suite/parts/inc/partition_crash.inc
9-
SET SESSION debug_dbug="-d,crash_drop_partition_2";
10+
SET SESSION debug_dbug=@save_dbug;
1011
SET SESSION debug_dbug="+d,crash_drop_partition_3";
1112
--source suite/parts/inc/partition_crash.inc
12-
SET SESSION debug_dbug="-d,crash_drop_partition_3";
13+
SET SESSION debug_dbug=@save_dbug;
1314
SET SESSION debug_dbug="+d,crash_drop_partition_4";
1415
--source suite/parts/inc/partition_crash.inc
15-
SET SESSION debug_dbug="-d,crash_drop_partition_4";
16+
SET SESSION debug_dbug=@save_dbug;
1617
SET SESSION debug_dbug="+d,crash_drop_partition_5";
1718
--source suite/parts/inc/partition_crash.inc
18-
SET SESSION debug_dbug="-d,crash_drop_partition_5";
19+
SET SESSION debug_dbug=@save_dbug;
1920
SET SESSION debug_dbug="+d,crash_drop_partition_6";
2021
--source suite/parts/inc/partition_crash.inc
21-
SET SESSION debug_dbug="-d,crash_drop_partition_6";
22+
SET SESSION debug_dbug=@save_dbug;
2223
SET SESSION debug_dbug="+d,crash_drop_partition_7";
2324
--source suite/parts/inc/partition_crash.inc
24-
SET SESSION debug_dbug="-d,crash_drop_partition_7";
25+
SET SESSION debug_dbug=@save_dbug;
2526
SET SESSION debug_dbug="+d,crash_drop_partition_8";
2627
--source suite/parts/inc/partition_crash.inc
27-
SET SESSION debug_dbug="-d,crash_drop_partition_8";
28+
SET SESSION debug_dbug=@save_dbug;
2829
SET SESSION debug_dbug="+d,crash_drop_partition_9";
2930
--source suite/parts/inc/partition_crash.inc
30-
SET SESSION debug_dbug="-d,crash_drop_partition_9";
31+
SET SESSION debug_dbug=@save_dbug;

‎mysql-test/suite/parts/inc/partition_crash_exchange.inc

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
# To be used with WL#4445: EXCHANGE PARTITION WITH TABLE.
2+
SET @save_dbug=@@debug_dbug;
23
SET SESSION debug_dbug="+d,exchange_partition_abort_1";
34
--source suite/parts/inc/partition_crash_t2.inc
4-
SET SESSION debug_dbug="-d,exchange_partition_abort_1";
5+
SET SESSION debug_dbug=@save_dbug;
56
SET SESSION debug_dbug="+d,exchange_partition_abort_2";
67
--source suite/parts/inc/partition_crash_t2.inc
7-
SET SESSION debug_dbug="-d,exchange_partition_abort_2";
8+
SET SESSION debug_dbug=@save_dbug;
89
SET SESSION debug_dbug="+d,exchange_partition_abort_3";
910
--source suite/parts/inc/partition_crash_t2.inc
10-
SET SESSION debug_dbug="-d,exchange_partition_abort_3";
11+
SET SESSION debug_dbug=@save_dbug;
1112
SET SESSION debug_dbug="+d,exchange_partition_abort_4";
1213
--source suite/parts/inc/partition_crash_t2.inc
13-
SET SESSION debug_dbug="-d,exchange_partition_abort_4";
14+
SET SESSION debug_dbug=@save_dbug;
1415
SET SESSION debug_dbug="+d,exchange_partition_abort_5";
1516
--source suite/parts/inc/partition_crash_t2.inc
16-
SET SESSION debug_dbug="-d,exchange_partition_abort_5";
17+
SET SESSION debug_dbug=@save_dbug;
1718
SET SESSION debug_dbug="+d,exchange_partition_abort_6";
1819
--source suite/parts/inc/partition_crash_t2.inc
19-
SET SESSION debug_dbug="-d,exchange_partition_abort_6";
20+
SET SESSION debug_dbug=@save_dbug;
2021
SET SESSION debug_dbug="+d,exchange_partition_abort_7";
2122
--source suite/parts/inc/partition_crash_t2.inc
22-
SET SESSION debug_dbug="-d,exchange_partition_abort_7";
23+
SET SESSION debug_dbug=@save_dbug;
2324
SET SESSION debug_dbug="+d,exchange_partition_abort_8";
2425
--source suite/parts/inc/partition_crash_t2.inc
25-
SET SESSION debug_dbug="-d,exchange_partition_abort_8";
26+
SET SESSION debug_dbug=@save_dbug;
2627
SET SESSION debug_dbug="+d,exchange_partition_abort_9";
2728
--source suite/parts/inc/partition_crash_t2.inc
28-
SET SESSION debug_dbug="-d,exchange_partition_abort_9";
29+
SET SESSION debug_dbug=@save_dbug;
2930

‎mysql-test/suite/parts/inc/partition_fail_add.inc

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
# To be used with partition mgm commands like
22
# ALTER TABLE t1 ADD PARTITION (LIST/RANGE PARTITIONING).
33
--echo # Error recovery testing ADD PARTITION
4+
SET @save_dbug=@@debug_dbug;
45
SET SESSION debug_dbug="+d,fail_add_partition_1";
56
--source suite/parts/inc/partition_fail.inc
6-
SET SESSION debug_dbug="-d,fail_add_partition_1";
7+
SET SESSION debug_dbug=@save_dbug;
78
SET SESSION debug_dbug="+d,fail_add_partition_2";
89
--source suite/parts/inc/partition_fail.inc
9-
SET SESSION debug_dbug="-d,fail_add_partition_2";
10+
SET SESSION debug_dbug=@save_dbug;
1011
SET SESSION debug_dbug="+d,fail_add_partition_3";
1112
--source suite/parts/inc/partition_fail.inc
12-
SET SESSION debug_dbug="-d,fail_add_partition_3";
13+
SET SESSION debug_dbug=@save_dbug;
1314
SET SESSION debug_dbug="+d,fail_add_partition_4";
1415
--source suite/parts/inc/partition_fail.inc
15-
SET SESSION debug_dbug="-d,fail_add_partition_4";
16+
SET SESSION debug_dbug=@save_dbug;
1617
SET SESSION debug_dbug="+d,fail_add_partition_5";
1718
--source suite/parts/inc/partition_fail.inc
18-
SET SESSION debug_dbug="-d,fail_add_partition_5";
19+
SET SESSION debug_dbug=@save_dbug;
1920
SET SESSION debug_dbug="+d,fail_add_partition_6";
2021
--source suite/parts/inc/partition_fail.inc
21-
SET SESSION debug_dbug="-d,fail_add_partition_6";
22+
SET SESSION debug_dbug=@save_dbug;
2223
SET SESSION debug_dbug="+d,fail_add_partition_7";
2324
--source suite/parts/inc/partition_fail.inc
24-
SET SESSION debug_dbug="-d,fail_add_partition_7";
25+
SET SESSION debug_dbug=@save_dbug;
2526
SET SESSION debug_dbug="+d,fail_add_partition_8";
2627
--source suite/parts/inc/partition_fail.inc
27-
SET SESSION debug_dbug="-d,fail_add_partition_8";
28+
SET SESSION debug_dbug=@save_dbug;
2829
SET SESSION debug_dbug="+d,fail_add_partition_9";
2930
--source suite/parts/inc/partition_fail.inc
30-
SET SESSION debug_dbug="-d,fail_add_partition_9";
31+
SET SESSION debug_dbug=@save_dbug;
3132
SET SESSION debug_dbug="+d,fail_add_partition_10";
3233
--source suite/parts/inc/partition_fail.inc
33-
SET SESSION debug_dbug="-d,fail_add_partition_10";
34+
SET SESSION debug_dbug=@save_dbug;

0 commit comments

Comments
 (0)