Merge remote-tracking branch 'origin/10.1' into 10.2

mysql-test/suite/galera/disabled.def

@@ -23,7 +23,6 @@ galera_as_slave_replication_bundle : MDEV-13549 Galera test failures
 galera_ssl_upgrade : MDEV-13549 Galera test failures
 galera.MW-329 : wsrep_local_replays not stable
 MW-416 : MDEV-13549 Galera test failures
-MW-388 : MDEV-13549 Galera test failures
 galera.MW-44 : MDEV-15809 Test failure on galera.MW-44
 galera.galera_pc_ignore_sb : MDEV-15811 Test failure on galera_pc_ignore_sb
 galera_kill_applier : race condition at the start of the test

mysql-test/suite/galera/r/MW-388.result

@@ -10,9 +10,7 @@ INSERT INTO t1 VALUES (1, 'node 1'),(2, 'node 1');
 INSERT INTO t1 VALUES (3, 'node 1');
 END|
 SET GLOBAL wsrep_slave_threads = 2;
-SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
+SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb";
 connection node_2;
 INSERT INTO t1 VALUES (1, 'node 2');;
 connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
@@ -24,9 +22,7 @@ SET SESSION DEBUG_SYNC = 'wsrep_after_replication SIGNAL wsrep_after_replication
 CALL insert_proc ();;
 connection node_1a;
 SET SESSION DEBUG_SYNC = "now WAIT_FOR wsrep_after_replication_reached";
-SET GLOBAL DEBUG = "";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
+SET GLOBAL debug_dbug = "";
 SET DEBUG_SYNC = "now SIGNAL wsrep_after_replication_continue";
 SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
 connection node_2;
@@ -47,9 +43,7 @@ connection node_1;
 SET GLOBAL wsrep_slave_threads = DEFAULT;
 DROP TABLE t1;
 DROP PROCEDURE insert_proc;
-SET GLOBAL debug = NULL;
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
+SET GLOBAL debug_dbug = "";
 SET debug_sync='RESET';
 SELECT @@debug_sync;
 @@debug_sync

mysql-test/suite/galera/r/MW-86-wait1.result

@@ -3,9 +3,7 @@ SELECT @@debug_sync;
 @@debug_sync
 ON - current signal: ''
 SET SESSION wsrep_sync_wait = 1;
-SET GLOBAL debug = "+d,sync.wsrep_apply_cb";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
+SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb";
 connection node_1;
 CREATE TABLE t_wait1 (f1 INTEGER) ENGINE=InnoDB;
 INSERT INTO t_wait1 VALUES (1);
@@ -36,15 +34,10 @@ SHOW TABLES;
 SHOW TRIGGERS;
 SHOW GLOBAL VARIABLES LIKE 'foo_bar';
 SHOW WARNINGS;
-SET GLOBAL debug = "-d,sync.wsrep_apply_cb";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
+SET GLOBAL debug_dbug = "";
 SET SESSION debug_sync = "now SIGNAL signal.wsrep_apply_cb";
 SET SESSION wsrep_sync_wait = default;
 DROP TABLE t_wait1;
-SET GLOBAL debug = NULL;
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
 SET debug_sync='RESET';
 SELECT @@debug_sync;
 @@debug_sync

mysql-test/suite/galera/r/MW-86-wait8.result

@@ -3,9 +3,7 @@ SELECT @@debug_sync;
 @@debug_sync
 ON - current signal: ''
 SET SESSION wsrep_sync_wait = 8;
-SET GLOBAL debug = "+d,sync.wsrep_apply_cb";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
+SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb";
 connection node_1;
 CREATE TABLE t_wait8 (f1 INTEGER) ENGINE=InnoDB;
 INSERT INTO t_wait8 VALUES (1);
@@ -38,15 +36,10 @@ SHOW TABLES;
 SHOW TRIGGERS;
 SHOW GLOBAL VARIABLES LIKE 'foo_bar';
 SHOW WARNINGS;
-SET GLOBAL debug = "-d,sync.wsrep_apply_cb";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
+SET GLOBAL debug_dbug = "";
 SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
 SET SESSION wsrep_sync_wait = default;
 DROP TABLE t_wait8;
-SET GLOBAL debug = NULL;
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
 SET debug_sync='RESET';
 SELECT @@debug_sync;
 @@debug_sync

mysql-test/suite/galera/r/galera_mdl_race.result

@@ -1,5 +1,5 @@
-CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1));
-CREATE TABLE t2 (f1 INTEGER PRIMARY KEY, f2 CHAR(1));
+CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)) engine=innodb;
+CREATE TABLE t2 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)) engine=innodb;
 INSERT INTO t1 VALUES (1, 'a');
 INSERT INTO t1 VALUES (2, 'a');
 connection node_1;
@@ -10,20 +10,13 @@ connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
 connection node_1a;
 LOCK TABLE t2 WRITE;
 connection node_1;
-SET GLOBAL DEBUG = "d,sync.wsrep_before_mdl_wait";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
+SET @@debug_dbug = "d,sync.wsrep_before_mdl_wait";
 SELECT * FROM t2;;
 connection node_1a;
-SET GLOBAL DEBUG = "d,sync.wsrep_after_BF_victim_lock";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
 connection node_2;
 UPDATE t1 SET f2 = 'c' WHERE f1 = 1;
 connection node_1a;
-SET GLOBAL DEBUG = "";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
+SET @@debug_dbug = "";
 SET DEBUG_SYNC = "now SIGNAL signal.wsrep_before_mdl_wait";
 SET DEBUG_SYNC = "now SIGNAL signal.wsrep_after_BF_victim_lock";
 UNLOCK TABLES;

mysql-test/suite/galera/r/galera_query_cache_sync_wait.result

@@ -2,9 +2,7 @@ CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 connection node_2;
 SET GLOBAL wsrep_provider_options = "repl.causal_read_timeout=PT1S";
-SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
+SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb";
 SELECT MAX(id) FROM t1;
 MAX(id)
 1
@@ -13,23 +11,17 @@ INSERT INTO t1 VALUES (2);
 connection node_2;
 SELECT MAX(id) FROM t1;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
-SET GLOBAL DEBUG = "";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
+SET GLOBAL debug_dbug = "";
 SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
 FLUSH QUERY CACHE;
-SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
+SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb";
 SET DEBUG_SYNC = "RESET";
 connection node_1;
 INSERT INTO t1 VALUES (3);
 connection node_2;
 SELECT MAX(id) FROM t1;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
-SET GLOBAL DEBUG = "";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
+SET GLOBAL debug_dbug = "";
 SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
 connection node_1;
 INSERT INTO t1 VALUES (4);
@@ -44,18 +36,13 @@ MAX(id)
 SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME = 'Qcache_hits';
 VARIABLE_VALUE = 1
 1
-SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
+SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb";
 connection node_1;
 INSERT INTO t1 VALUES (5);
 connection node_2;
 SELECT MAX(id) FROM t1 ;
-connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
+SET GLOBAL debug_dbug = "";
 connection node_2a;
-SET GLOBAL DEBUG = "";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
 SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
 connection node_2;
 MAX(id)

mysql-test/suite/galera/t/MW-388.test

@@ -1,6 +1,4 @@
 --source include/galera_cluster.inc
---source include/have_innodb.inc
---source include/have_debug.inc
 --source include/have_debug_sync.inc
 
 --connection node_1
@@ -29,8 +27,9 @@ DELIMITER ;|
 # that of the INSERT. Because there is only one slave thread,
 # commit cut is not processed and therefore does not advance
 # local monitor, and our INSERT remains stuck there.
+
 SET GLOBAL wsrep_slave_threads = 2;
-SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
+SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb";
 
 --connection node_2
 --send INSERT INTO t1 VALUES (1, 'node 2');
@@ -47,8 +46,7 @@ SET SESSION DEBUG_SYNC = 'wsrep_after_replication SIGNAL wsrep_after_replication
 --connection node_1a
 SET SESSION DEBUG_SYNC = "now WAIT_FOR wsrep_after_replication_reached";
 
-
-SET GLOBAL DEBUG = "";
+SET GLOBAL debug_dbug = "";
 SET DEBUG_SYNC = "now SIGNAL wsrep_after_replication_continue";
 SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
 
@@ -69,7 +67,7 @@ SET GLOBAL wsrep_slave_threads = DEFAULT;
 DROP TABLE t1;
 DROP PROCEDURE insert_proc;
 
-SET GLOBAL debug = NULL;
+SET GLOBAL debug_dbug = "";
 SET debug_sync='RESET';
 
 # Make sure no pending signals are leftover to surprise subsequent tests.

mysql-test/suite/galera/t/MW-86-wait1.test

@@ -12,7 +12,7 @@
 SELECT @@debug_sync;
 
 SET SESSION wsrep_sync_wait = 1;
-SET GLOBAL debug = "+d,sync.wsrep_apply_cb";
+SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb";
 
 --connection node_1
 CREATE TABLE t_wait1 (f1 INTEGER) ENGINE=InnoDB;
@@ -90,7 +90,7 @@ SHOW WARNINGS;
 --enable_result_log
 
 # Unblock the background INSERT and remove the sync point.
-SET GLOBAL debug = "-d,sync.wsrep_apply_cb";
+SET GLOBAL debug_dbug = "";
 SET SESSION debug_sync = "now SIGNAL signal.wsrep_apply_cb";
 
 SET SESSION wsrep_sync_wait = default;
@@ -99,7 +99,6 @@ SET SESSION wsrep_sync_wait = default;
 # from the test.
 DROP TABLE t_wait1;
 
-SET GLOBAL debug = NULL;
 SET debug_sync='RESET';
 
 # Make sure no pending signals are leftover to surprise subsequent tests.

mysql-test/suite/galera/t/MW-86-wait8.test

@@ -10,7 +10,7 @@
 SELECT @@debug_sync;
 
 SET SESSION wsrep_sync_wait = 8;
-SET GLOBAL debug = "+d,sync.wsrep_apply_cb";
+SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb";
 
 --connection node_1
 CREATE TABLE t_wait8 (f1 INTEGER) ENGINE=InnoDB;
@@ -112,7 +112,7 @@ SHOW WARNINGS;
 --enable_query_log
 
 # Unblock the background INSERT and remove the sync point.
-SET GLOBAL debug = "-d,sync.wsrep_apply_cb";
+SET GLOBAL debug_dbug = "";
 SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
 
 SET SESSION wsrep_sync_wait = default;
@@ -121,7 +121,6 @@ SET SESSION wsrep_sync_wait = default;
 # from the test.
 DROP TABLE t_wait8;
 
-SET GLOBAL debug = NULL;
 SET debug_sync='RESET';
 
 # Make sure no pending signals are leftover to surprise subsequent tests.

mysql-test/suite/galera/t/galera_mdl_race.test

@@ -3,11 +3,10 @@
 #
 
 --source include/galera_cluster.inc
---source include/have_innodb.inc
 --source include/have_debug_sync.inc
 
-CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1));
-CREATE TABLE t2 (f1 INTEGER PRIMARY KEY, f2 CHAR(1));
+CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)) engine=innodb;
+CREATE TABLE t2 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)) engine=innodb;
 INSERT INTO t1 VALUES (1, 'a');
 INSERT INTO t1 VALUES (2, 'a');
 
@@ -24,7 +23,7 @@ LOCK TABLE t2 WRITE;
 
 # Block before MLD lock wait
 --connection node_1
-  SET GLOBAL DEBUG = "d,sync.wsrep_before_mdl_wait";     
+  SET @@debug_dbug = "d,sync.wsrep_before_mdl_wait";
 --send SELECT * FROM t2;
 
 # Wait for SELECT to be blocked
@@ -35,27 +34,21 @@ LOCK TABLE t2 WRITE;
 #--source include/wait_condition.inc
 
 # block applier to wait after BF victim is locked
-SET GLOBAL DEBUG = "d,sync.wsrep_after_BF_victim_lock";
+SET @@debug_dbug = "d,sync.wsrep_after_BF_victim_lock";
 
 # Issue a conflicting update on node #2
 --connection node_2
 UPDATE t1 SET f2 = 'c' WHERE f1 = 1;
 
---sleep 3
-
 # Unblock the SELECT, to enter wsrep_thd_is_BF
 --connection node_1a
-SET GLOBAL DEBUG = "";
+SET @@debug_dbug = "";
 SET DEBUG_SYNC = "now SIGNAL signal.wsrep_before_mdl_wait";
 
---sleep 3
-
 # unblock applier to try to BF the SELECT
 SET DEBUG_SYNC = "now SIGNAL signal.wsrep_after_BF_victim_lock";
 
-
 # table lock is not needed anymore
---sleep 3
 UNLOCK TABLES;
 
 # SELECT succeeds

mysql-test/suite/galera/t/galera_query_cache_sync_wait.test

@@ -1,5 +1,4 @@
 --source include/galera_cluster.inc
---source include/have_innodb.inc
 --source include/have_debug_sync.inc
 --source include/have_query_cache.inc
 
@@ -9,7 +8,7 @@ INSERT INTO t1 VALUES (1);
 --connection node_2
 --let $wsrep_provider_options_orig = `SELECT @@wsrep_provider_options`
 SET GLOBAL wsrep_provider_options = "repl.causal_read_timeout=PT1S";
-SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
+SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb";
 SELECT MAX(id) FROM t1; # first lookup miss
 
 #
@@ -22,11 +21,11 @@ INSERT INTO t1 VALUES (2);
 --connection node_2
 --error ER_LOCK_WAIT_TIMEOUT
 SELECT MAX(id) FROM t1;
-SET GLOBAL DEBUG = "";
+SET GLOBAL debug_dbug = "";
 SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
 
 FLUSH QUERY CACHE;
-SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
+SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb";
 SET DEBUG_SYNC = "RESET";
 
 #
@@ -39,7 +38,7 @@ INSERT INTO t1 VALUES (3);
 --connection node_2
 --error ER_LOCK_WAIT_TIMEOUT
 SELECT MAX(id) FROM t1;
-SET GLOBAL DEBUG = "";
+SET GLOBAL debug_dbug = "";
 SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
 
 #
@@ -59,7 +58,7 @@ SELECT MAX(id) FROM t1;
 FLUSH STATUS;
 SELECT MAX(id) FROM t1;
 SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME = 'Qcache_hits';
-SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
+SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb";
 
 #
 # Query cache invalidated
@@ -73,7 +72,7 @@ INSERT INTO t1 VALUES (5);
 
 --connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2
 --connection node_2a
-SET GLOBAL DEBUG = "";
+SET GLOBAL debug_dbug = "";
 SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
 
 --connection node_2