[Commits] dc3d48b3a4a: MDEV-18265: Replace deprecated variable debug to debug_dbug on Galera tests
revision-id: dc3d48b3a4a87a6b47ca6fafd9ea31f00e8bfed2 (mariadb-10.4.3-160-gdc3d48b3a4a) parent(s): d2013e73288c953a6cbcdddf9688584c0353535d author: Jan Lindström committer: Jan Lindström timestamp: 2019-04-06 12:25:29 +0300 message: MDEV-18265: Replace deprecated variable debug to debug_dbug on Galera tests deleted: mysql-test/suite/galera/r/MW-86.result deleted: mysql-test/suite/galera/r/mysql-wsrep#216.result modified: mysql-test/suite/galera/t/GCF-1081.test modified: mysql-test/suite/galera_3nodes_sr/r/GCF-832.result modified: mysql-test/suite/galera_3nodes_sr/t/GCF-810A.test modified: mysql-test/suite/galera_3nodes_sr/t/GCF-810B.test modified: mysql-test/suite/galera_3nodes_sr/t/GCF-810C.test modified: mysql-test/suite/galera_3nodes_sr/t/GCF-832.test modified: mysql-test/suite/galera_sr/r/mysql-wsrep-features#35.result modified: mysql-test/suite/galera_sr/t/mysql-wsrep-features#35.test --- mysql-test/suite/galera/r/MW-86.result | 78 ---------------------- mysql-test/suite/galera/r/mysql-wsrep#216.result | 11 --- mysql-test/suite/galera/t/GCF-1081.test | 4 +- mysql-test/suite/galera_3nodes_sr/r/GCF-832.result | 4 +- mysql-test/suite/galera_3nodes_sr/t/GCF-810A.test | 12 ++-- mysql-test/suite/galera_3nodes_sr/t/GCF-810B.test | 4 +- mysql-test/suite/galera_3nodes_sr/t/GCF-810C.test | 8 +-- mysql-test/suite/galera_3nodes_sr/t/GCF-832.test | 2 +- .../galera_sr/r/mysql-wsrep-features#35.result | 8 +-- .../suite/galera_sr/t/mysql-wsrep-features#35.test | 4 +- 10 files changed, 20 insertions(+), 115 deletions(-) diff --git a/mysql-test/suite/galera/r/MW-86.result b/mysql-test/suite/galera/r/MW-86.result deleted file mode 100644 index bca9be93191..00000000000 --- a/mysql-test/suite/galera/r/MW-86.result +++ /dev/null @@ -1,78 +0,0 @@ -connection node_2; -connection node_1; -connection node_2; -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 -connection node_1; -CREATE DATABASE db1; -CREATE TABLE bar (f1 INTEGER) ENGINE=InnoDB; -INSERT INTO bar VALUES (1); -connection node_2; -SHOW BINARY LOGS; -SHOW BINLOG EVENTS; -SHOW COLUMNS FROM t1; -SHOW CREATE DATABASE db1; -SHOW CREATE EVENT e1; -SHOW CREATE FUNCTION f1; -SHOW CREATE PROCEDURE p1; -SHOW CREATE TABLE t1; -SHOW CREATE TRIGGER tr1; -SHOW CREATE VIEW v1; -SHOW DATABASES; -SHOW ENGINE InnoDB STATUS; -SHOW FUNCTION CODE f1; -SHOW FUNCTION STATUS; -SHOW GRANTS FOR 'root'@'localhost'; -SHOW INDEX FROM t1; -SHOW OPEN TABLES; -SHOW PROCEDURE CODE p1; -SHOW PROCEDURE STATUS; -SHOW PRIVILEGES; -SHOW STATUS LIKE 'wsrep_cluster_size'; -SHOW TABLE STATUS; -SHOW TABLES; -SHOW TRIGGERS; -SHOW GLOBAL VARIABLES LIKE 'foo_bar'; -SHOW WARNINGS; -SET GLOBAL DEBUG = ""; -SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; -SET SESSION wsrep_sync_wait = 8; -DROP DATABASE db1; -connection node_2; -SET GLOBAL wsrep_provider_options = "repl.causal_read_timeout=PT0.1S"; -SET SESSION wsrep_sync_wait = 8; -SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb"; -connection node_1; -CREATE TABLE q (f1 INTEGER) ENGINE=InnoDB; -INSERT INTO q VALUES (1); -connection node_2; -SHOW BINARY LOGS; -SHOW BINLOG EVENTS; -SHOW COLUMNS FROM t1; -SHOW CREATE DATABASE db1; -SHOW CREATE EVENT e1; -SHOW CREATE FUNCTION f1; -SHOW CREATE PROCEDURE p1; -SHOW CREATE TABLE t1; -SHOW CREATE TRIGGER tr1; -SHOW CREATE VIEW v1; -SHOW DATABASES; -SHOW ENGINE InnoDB STATUS; -SHOW FUNCTION CODE f1; -SHOW FUNCTION STATUS; -SHOW GRANTS FOR 'root'@'localhost'; -SHOW INDEX FROM t1; -SHOW OPEN TABLES; -SHOW PROCEDURE CODE p1; -SHOW PROCEDURE STATUS; -SHOW PRIVILEGES; -SHOW STATUS LIKE 'wsrep_cluster_size'; -SHOW TABLE STATUS; -SHOW TABLES; -SHOW TRIGGERS; -SHOW GLOBAL VARIABLES LIKE 'foo_bar'; -SHOW WARNINGS; -SET GLOBAL DEBUG = ""; -SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; diff --git a/mysql-test/suite/galera/r/mysql-wsrep#216.result b/mysql-test/suite/galera/r/mysql-wsrep#216.result deleted file mode 100644 index b07589d0c04..00000000000 --- a/mysql-test/suite/galera/r/mysql-wsrep#216.result +++ /dev/null @@ -1,11 +0,0 @@ -SET GLOBAL wsrep_debug = ON; -CREATE USER u1 IDENTIFIED BY 'plaintext_password'; -CREATE USER u1 IDENTIFIED BY 'plaintext_password'; -ERROR HY000: Operation CREATE USER failed for 'u1'@'%' -0 -0 -2 -1 -DROP USER u1; -CALL mtr.add_suppression('Operation CREATE USER failed'); - \ No newline at end of file diff --git a/mysql-test/suite/galera/t/GCF-1081.test b/mysql-test/suite/galera/t/GCF-1081.test index 8296c55f1b6..38553feda39 100644 --- a/mysql-test/suite/galera/t/GCF-1081.test +++ b/mysql-test/suite/galera/t/GCF-1081.test @@ -38,7 +38,7 @@ SET SESSION wsrep_sync_wait = 0; # Issue a conflicting insert on node #2 --connection node_1a -SET GLOBAL DEBUG = 'd,sync.wsrep_before_BF_victim_unlock'; +SET GLOBAL debug_dbug = 'd,sync.wsrep_before_BF_victim_unlock'; --connection node_2 --send INSERT INTO t1 VALUES (2, 2); @@ -46,7 +46,7 @@ SET GLOBAL DEBUG = 'd,sync.wsrep_before_BF_victim_unlock'; # Wait until it BF aborts the SP --connection node_1a SET SESSION DEBUG_SYNC = 'now WAIT_FOR sync.wsrep_before_BF_victim_unlock_reached'; -SET GLOBAL DEBUG = ''; +SET GLOBAL debug_dbug = ''; # Unblock the SP --connection node_1a diff --git a/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result b/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result index 58d02e541af..8333fff98db 100644 --- a/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result +++ b/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result @@ -5,9 +5,7 @@ connection node_1; connection node_2; connection node_3; connection node_2; -SET GLOBAL debug="d,crash_last_fragment_commit_after_fragment_removal"; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET GLOBAL debug_dbug="d,crash_last_fragment_commit_after_fragment_removal"; CREATE TABLE t1 (f1 VARCHAR(30)) ENGINE=InnoDB; SET AUTOCOMMIT=OFF; SET SESSION wsrep_trx_fragment_size=1; diff --git a/mysql-test/suite/galera_3nodes_sr/t/GCF-810A.test b/mysql-test/suite/galera_3nodes_sr/t/GCF-810A.test index 38d95556e48..fda16b7265c 100644 --- a/mysql-test/suite/galera_3nodes_sr/t/GCF-810A.test +++ b/mysql-test/suite/galera_3nodes_sr/t/GCF-810A.test @@ -16,7 +16,7 @@ --connection node_2 --enable_reconnect -SET GLOBAL debug="d,crash_last_fragment_commit_before_fragment_removal"; +SET GLOBAL debug_dbug="d,crash_last_fragment_commit_before_fragment_removal"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes.inc @@ -39,7 +39,7 @@ COMMIT; # --connection node_2 -SET GLOBAL debug="d,crash_last_fragment_commit_after_fragment_removal"; +SET GLOBAL debug_dbug="d,crash_last_fragment_commit_after_fragment_removal"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes.inc @@ -66,7 +66,7 @@ COMMIT; # # --connection node_2 -# SET GLOBAL debug="d,crash_last_fragment_commit_success"; +# SET GLOBAL debug_dbug="d,crash_last_fragment_commit_success"; # --source suite/galera_3nodes/include/galera_expect_node_crash.inc # --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes.inc @@ -84,7 +84,7 @@ COMMIT; # --connection node_2 -SET GLOBAL debug="d,crash_replicate_fragment_success"; +SET GLOBAL debug_dbug="d,crash_replicate_fragment_success"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes.inc @@ -102,7 +102,7 @@ COMMIT; # --connection node_2 -SET GLOBAL debug="d,crash_replicate_fragment_after_certify"; +SET GLOBAL debug_dbug="d,crash_replicate_fragment_after_certify"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes.inc @@ -120,7 +120,7 @@ COMMIT; # --connection node_2 -SET GLOBAL debug="d,crash_replicate_fragment_before_certify"; +SET GLOBAL debug_dbug="d,crash_replicate_fragment_before_certify"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes.inc diff --git a/mysql-test/suite/galera_3nodes_sr/t/GCF-810B.test b/mysql-test/suite/galera_3nodes_sr/t/GCF-810B.test index 24a518af9f7..cb41b2348de 100644 --- a/mysql-test/suite/galera_3nodes_sr/t/GCF-810B.test +++ b/mysql-test/suite/galera_3nodes_sr/t/GCF-810B.test @@ -15,7 +15,7 @@ # --connection node_3 -SET GLOBAL debug="d,crash_apply_cb_before_append_frag"; +SET GLOBAL debug_dbug="d,crash_apply_cb_before_append_frag"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes2.inc @@ -32,7 +32,7 @@ COMMIT; # --connection node_3 -SET GLOBAL debug="d,crash_apply_cb_after_append_frag"; +SET GLOBAL debug_dbug="d,crash_apply_cb_after_append_frag"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes2.inc diff --git a/mysql-test/suite/galera_3nodes_sr/t/GCF-810C.test b/mysql-test/suite/galera_3nodes_sr/t/GCF-810C.test index 79948e5a46d..6c4da2cb5f0 100644 --- a/mysql-test/suite/galera_3nodes_sr/t/GCF-810C.test +++ b/mysql-test/suite/galera_3nodes_sr/t/GCF-810C.test @@ -16,7 +16,7 @@ # --connection node_3 -SET GLOBAL debug="d,crash_commit_cb_last_fragment_commit_success"; +SET GLOBAL debug_dbug="d,crash_commit_cb_last_fragment_commit_success"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes3.inc @@ -30,7 +30,7 @@ SET GLOBAL debug="d,crash_commit_cb_last_fragment_commit_success"; # --connection node_3 -SET GLOBAL debug="d,crash_commit_cb_before_last_fragment_commit"; +SET GLOBAL debug_dbug="d,crash_commit_cb_before_last_fragment_commit"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes3.inc @@ -44,7 +44,7 @@ SET GLOBAL debug="d,crash_commit_cb_before_last_fragment_commit"; # --connection node_3 -SET GLOBAL debug="d,crash_apply_cb_after_fragment_removal"; +SET GLOBAL debug_dbug="d,crash_apply_cb_after_fragment_removal"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes3.inc @@ -58,7 +58,7 @@ SET GLOBAL debug="d,crash_apply_cb_after_fragment_removal"; # --connection node_3 -SET GLOBAL debug="d,crash_apply_cb_before_fragment_removal"; +SET GLOBAL debug_dbug="d,crash_apply_cb_before_fragment_removal"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes3.inc diff --git a/mysql-test/suite/galera_3nodes_sr/t/GCF-832.test b/mysql-test/suite/galera_3nodes_sr/t/GCF-832.test index c5a6346d6a1..eb7f5603452 100644 --- a/mysql-test/suite/galera_3nodes_sr/t/GCF-832.test +++ b/mysql-test/suite/galera_3nodes_sr/t/GCF-832.test @@ -13,7 +13,7 @@ --source ../galera/include/auto_increment_offset_save.inc --connection node_2 -SET GLOBAL debug="d,crash_last_fragment_commit_after_fragment_removal"; +SET GLOBAL debug_dbug="d,crash_last_fragment_commit_after_fragment_removal"; --let $_server_id= `SELECT @@server_id` --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect diff --git a/mysql-test/suite/galera_sr/r/mysql-wsrep-features#35.result b/mysql-test/suite/galera_sr/r/mysql-wsrep-features#35.result index 41657d7340a..3f463875eb3 100644 --- a/mysql-test/suite/galera_sr/r/mysql-wsrep-features#35.result +++ b/mysql-test/suite/galera_sr/r/mysql-wsrep-features#35.result @@ -6,9 +6,7 @@ SELECT COUNT(*) = 0 FROM t1; COUNT(*) = 0 1 SET SESSION wsrep_sync_wait = 0; -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; SET SESSION wsrep_trx_fragment_size = 1; SET AUTOCOMMIT=OFF; @@ -29,9 +27,7 @@ INSERT INTO t1 VALUES (1);; connection node_1; COMMIT; 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 GLOBAL debug_dbug = ''; SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; connection node_2; Got one of the listed errors diff --git a/mysql-test/suite/galera_sr/t/mysql-wsrep-features#35.test b/mysql-test/suite/galera_sr/t/mysql-wsrep-features#35.test index c5cf1dea0ae..f63e1cca70c 100644 --- a/mysql-test/suite/galera_sr/t/mysql-wsrep-features#35.test +++ b/mysql-test/suite/galera_sr/t/mysql-wsrep-features#35.test @@ -9,7 +9,7 @@ CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB; --connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2 SELECT COUNT(*) = 0 FROM t1; SET SESSION wsrep_sync_wait = 0; -SET GLOBAL debug = '+d,sync.wsrep_apply_cb'; +SET GLOBAL debug_dbug = '+d,sync.wsrep_apply_cb'; --connection node_1 SET SESSION wsrep_trx_fragment_size = 1; @@ -34,7 +34,7 @@ SELECT COUNT(*) = 0 FROM t1; COMMIT; --connection node_2a -SET GLOBAL debug = ''; +SET GLOBAL debug_dbug = ''; SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; --connection node_2
participants (1)
-
jan