revision-id: 666eb99fd7701e2d01d6a9bafd1ec5dd6de099ff (mariadb-10.1.38-14-g666eb99fd77) parent(s): 243f829c1c772c1b8e9e0717fbf5839e84244559 author: Jan Lindström committer: Jan Lindström timestamp: 2019-02-27 13:15:03 +0200 message: MDEV-18265: Replace deprecated variable debug to debug_dbug on Galera tests Replaced debug to debug_dbug on 10.1 on galera suite. Nothing to do in wsrep and galera_3nodes suites. --- mysql-test/suite/galera/disabled.def | 1 - mysql-test/suite/galera/r/MW-388.result | 12 +++-------- mysql-test/suite/galera/r/MW-86-wait1.result | 11 ++-------- mysql-test/suite/galera/r/MW-86-wait8.result | 11 ++-------- mysql-test/suite/galera/r/galera_mdl_race.result | 16 +++++---------- .../galera/r/galera_query_cache_sync_wait.result | 24 ++++++---------------- mysql-test/suite/galera/t/MW-388.test | 10 ++++----- mysql-test/suite/galera/t/MW-86-wait1.test | 5 ++--- mysql-test/suite/galera/t/MW-86-wait8.test | 5 ++--- mysql-test/suite/galera/t/galera_mdl_race.test | 17 +++++---------- .../galera/t/galera_query_cache_sync_wait.test | 13 ++++++------ 11 files changed, 37 insertions(+), 88 deletions(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index d0bc20b0de7..b81c9a737ec 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/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_sst_mysqldump_with_key : MDEV-16890 Galera test failure galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion diff --git a/mysql-test/suite/galera/r/MW-388.result b/mysql-test/suite/galera/r/MW-388.result index 59d4d4a2bf3..141189e45c6 100644 --- a/mysql-test/suite/galera/r/MW-388.result +++ b/mysql-test/suite/galera/r/MW-388.result @@ -9,18 +9,14 @@ 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"; INSERT INTO t1 VALUES (1, 'node 2');; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; SET SESSION wsrep_sync_wait = 0; SET SESSION DEBUG_SYNC = 'wsrep_after_replication SIGNAL wsrep_after_replication_reached WAIT_FOR wsrep_after_replication_continue'; CALL insert_proc ();; 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"; SELECT @errno = 1213; @@ -37,9 +33,7 @@ f1 f2 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 diff --git a/mysql-test/suite/galera/r/MW-86-wait1.result b/mysql-test/suite/galera/r/MW-86-wait1.result index a38255eff8f..88b6ca30884 100644 --- a/mysql-test/suite/galera/r/MW-86-wait1.result +++ b/mysql-test/suite/galera/r/MW-86-wait1.result @@ -2,9 +2,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"; CREATE TABLE t_wait1 (f1 INTEGER) ENGINE=InnoDB; INSERT INTO t_wait1 VALUES (1); SET SESSION debug_sync = "now WAIT_FOR sync.wsrep_apply_cb_reached"; @@ -33,15 +31,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 diff --git a/mysql-test/suite/galera/r/MW-86-wait8.result b/mysql-test/suite/galera/r/MW-86-wait8.result index 04c93e9a9f2..d5aa5037676 100644 --- a/mysql-test/suite/galera/r/MW-86-wait8.result +++ b/mysql-test/suite/galera/r/MW-86-wait8.result @@ -2,9 +2,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"; CREATE TABLE t_wait8 (f1 INTEGER) ENGINE=InnoDB; INSERT INTO t_wait8 VALUES (1); SET GLOBAL wsrep_provider_options = "repl.causal_read_timeout=PT0.1S"; @@ -35,15 +33,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 diff --git a/mysql-test/suite/galera/r/galera_mdl_race.result b/mysql-test/suite/galera/r/galera_mdl_race.result index 535f20de7f1..b48900669cf 100644 --- a/mysql-test/suite/galera/r/galera_mdl_race.result +++ b/mysql-test/suite/galera/r/galera_mdl_race.result @@ -1,22 +1,16 @@ -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'); SET AUTOCOMMIT=ON; START TRANSACTION; UPDATE t1 SET f2 = 'b' WHERE f1 = 1; LOCK TABLE t2 WRITE; -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;; -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 +SET @@debug_dbug = "d,sync.wsrep_after_BF_victim_lock"; UPDATE t1 SET f2 = 'c' WHERE f1 = 1; -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; diff --git a/mysql-test/suite/galera/r/galera_query_cache_sync_wait.result b/mysql-test/suite/galera/r/galera_query_cache_sync_wait.result index 5fe382048fb..b1cceebb010 100644 --- a/mysql-test/suite/galera/r/galera_query_cache_sync_wait.result +++ b/mysql-test/suite/galera/r/galera_query_cache_sync_wait.result @@ -1,30 +1,22 @@ CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); 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 INSERT INTO t1 VALUES (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"; INSERT INTO t1 VALUES (3); 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"; INSERT INTO t1 VALUES (4); SELECT MAX(id) FROM t1; @@ -37,14 +29,10 @@ 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"; INSERT INTO t1 VALUES (5); SELECT MAX(id) FROM t1 ; -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"; MAX(id) 5 diff --git a/mysql-test/suite/galera/t/MW-388.test b/mysql-test/suite/galera/t/MW-388.test index 209695dca80..fafdde092bf 100644 --- a/mysql-test/suite/galera/t/MW-388.test +++ b/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. diff --git a/mysql-test/suite/galera/t/MW-86-wait1.test b/mysql-test/suite/galera/t/MW-86-wait1.test index 6c0982ad8b3..40a7882829b 100644 --- a/mysql-test/suite/galera/t/MW-86-wait1.test +++ b/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. diff --git a/mysql-test/suite/galera/t/MW-86-wait8.test b/mysql-test/suite/galera/t/MW-86-wait8.test index 65e612c5c8e..551b0f67b7c 100644 --- a/mysql-test/suite/galera/t/MW-86-wait8.test +++ b/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. diff --git a/mysql-test/suite/galera/t/galera_mdl_race.test b/mysql-test/suite/galera/t/galera_mdl_race.test index 508b85add4b..ad6770f9991 100644 --- a/mysql-test/suite/galera/t/galera_mdl_race.test +++ b/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 diff --git a/mysql-test/suite/galera/t/galera_query_cache_sync_wait.test b/mysql-test/suite/galera/t/galera_query_cache_sync_wait.test index 87afc2d7bb2..e13e7f1f748 100644 --- a/mysql-test/suite/galera/t/galera_query_cache_sync_wait.test +++ b/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