From 3574f9c7bc74ae1dd87b442b70929f30e6f95c8e Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Thu, 7 Dec 2017 21:10:51 +0200
Subject: [PATCH] Updated MW-388.result file

---
 mysql-test/suite/galera/r/MW-388.result | 12 +++---------
 mysql-test/suite/galera/t/MW-388.test   |  6 +++---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/mysql-test/suite/galera/r/MW-388.result b/mysql-test/suite/galera/r/MW-388.result
index 7a8c2adafc1..a2cf02712bb 100644
--- a/mysql-test/suite/galera/r/MW-388.result
+++ b/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 = NULL;
 SET debug_sync='RESET';
 SELECT @@debug_sync;
 @@debug_sync
diff --git a/mysql-test/suite/galera/t/MW-388.test b/mysql-test/suite/galera/t/MW-388.test
index 209695dca80..de1ac52bf3e 100644
--- a/mysql-test/suite/galera/t/MW-388.test
+++ b/mysql-test/suite/galera/t/MW-388.test
@@ -30,7 +30,7 @@ DELIMITER ;|
 # 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');
@@ -48,7 +48,7 @@ SET SESSION DEBUG_SYNC = 'wsrep_after_replication SIGNAL wsrep_after_replication
 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 +69,7 @@ SET GLOBAL wsrep_slave_threads = DEFAULT;
 DROP TABLE t1;
 DROP PROCEDURE insert_proc;
 
-SET GLOBAL debug = NULL;
+SET GLOBAL debug_dbug = NULL;
 SET debug_sync='RESET';
 
 # Make sure no pending signals are leftover to surprise subsequent tests.