Skip to content
Permalink
Browse files
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
  • Loading branch information
Jan Lindström committed Apr 6, 2019
1 parent 8a194d9 commit fe62ff6
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 115 deletions.
78 mysql-test/suite/galera/r/MW-86.result
View file

This file was deleted.

11 mysql-test/suite/galera/r/mysql-wsrep#216.result
View file

This file was deleted.

4 mysql-test/suite/galera/t/GCF-1081.test
View file
@@ -38,15 +38,15 @@ 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);

# 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
4 mysql-test/suite/galera_3nodes_sr/r/GCF-832.result
View file
@@ -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;
12 mysql-test/suite/galera_3nodes_sr/t/GCF-810A.test
View file
@@ -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

4 mysql-test/suite/galera_3nodes_sr/t/GCF-810B.test
View file
@@ -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

8 mysql-test/suite/galera_3nodes_sr/t/GCF-810C.test
View file
@@ -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

2 mysql-test/suite/galera_3nodes_sr/t/GCF-832.test
View file
@@ -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
8 mysql-test/suite/galera_sr/r/mysql-wsrep-features#35.result
View file
@@ -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
4 mysql-test/suite/galera_sr/t/mysql-wsrep-features#35.test
View file
@@ -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

0 comments on commit fe62ff6

Please sign in to comment.