rename debug variable to debug_dbug, to make test pass in release builds

(and to follow the naming conventons). keep old debug variable, but mark it as deprecated.

rename debug variable to debug_dbug, to make test pass in release builds
(and to follow the naming conventons). keep old debug variable, but mark it as deprecated.
1efdd5a5 · Sergei Golubchik · b86ba751 · 1efdd5a5 · 1efdd5a5 · 1efdd5a5
Commit 1efdd5a5 authored Dec 15, 2011 by Sergei Golubchik
147 changed files
--- a/INSTALL-SOURCE
+++ b/INSTALL-SOURCE
@@ -1461,7 +1461,7 @@ shell> ./configure --with-debug
       (http://forge.mysql.com/wiki/MySQL_Internals_Porting).
       As of MySQL 5.1.12, using --with-debug to configure MySQL with
       debugging support enables you to use the
-       --debug="d,parser_debug" option when you start the server.
+       --debug-dbug="d,parser_debug" option when you start the server.
       This causes the Bison parser that is used to process SQL
       statements to dump a parser trace to the server's standard
       error output. Typically, this output is written to the error
@@ -4725,7 +4725,7 @@ Note
   the screen that may help solve the problem.
   The last option is to start mysqld with the --standalone and
-   --debug options. In this case, mysqld writes a log file
+   --debug-dbug options. In this case, mysqld writes a log file
   C:\mysqld.trace that should contain the reason why mysqld doesn't
   start. See MySQL Internals: Porting
   (http://forge.mysql.com/wiki/MySQL_Internals_Porting).
@@ -7716,7 +7716,7 @@ Can't start server: Bind on unix socket...
   MIT-pthreads.
   If you cannot get mysqld to start, you can try to make a trace
-   file to find the problem by using the --debug option. See MySQL
+   file to find the problem by using the --debug-dbug option. See MySQL
   Internals: Porting
   (http://forge.mysql.com/wiki/MySQL_Internals_Porting).

--- a/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
+++ b/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
@@ -42,7 +42,7 @@ if (!$debug_sync_action)
 # Restart slave
 --source include/stop_slave.inc
-eval SET @@global.debug= "+d,$dbug_sync_point";
+eval SET @@global.debug_dbug= "+d,$dbug_sync_point";
 --source include/start_slave.inc
 --echo slave is going to hang in get_master_version_and_clock
@@ -71,7 +71,7 @@ source include/wait_for_slave_io_error.inc;
 # now to avoid restarting IO-thread to re-enter it.
 # There will be a new IO thread forked out with its @@session.debug
 # unset.
-eval set @@global.debug = "-d,$dbug_sync_point";
+eval set @@global.debug_dbug= "-d,$dbug_sync_point";
 --let $rpl_server_number= 1
 --source include/rpl_start_server.inc

--- a/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test
+++ b/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test
@@ -13,7 +13,7 @@ create table tm (a int auto_increment primary key) engine=myisam;
 create table ti (a int auto_increment primary key) engine=innodb;
 sync_slave_with_master;
-set @@global.debug="+d,stop_slave_middle_group";
+set @@global.debug_dbug="+d,stop_slave_middle_group";
 connection master;
@@ -43,7 +43,7 @@ eval SELECT "NO$error" AS Last_SQL_Error, @check as `true`;
 select count(*) as one from tm;
 select count(*) as one from ti;
-set @@global.debug="-d";
+set @@global.debug_dbug="-d";
 #
 # bug#45940 issues around rli->last_event_start_time
@@ -67,8 +67,8 @@ truncate table ti;
 #connection slave;
 sync_slave_with_master;
-set @@global.debug="+d,stop_slave_middle_group";
+set @@global.debug_dbug="+d,stop_slave_middle_group";
-set @@global.debug="+d,incomplete_group_in_relay_log";
+set @@global.debug_dbug="+d,incomplete_group_in_relay_log";
 connection master;
@@ -96,7 +96,7 @@ eval SELECT "$error" AS Last_SQL_Error, @check as `true`;
 select count(*) as one  from tm;
 select count(*) as zero from ti;
-set @@global.debug="-d";
+set @@global.debug_dbug="-d";
 #
 # The mixed multi-table update
@@ -109,8 +109,8 @@ connection master;
 #connection slave;
 sync_slave_with_master;
-set @@global.debug="+d,stop_slave_middle_group";
+set @@global.debug_dbug="+d,stop_slave_middle_group";
-set @@global.debug="+d,incomplete_group_in_relay_log";
+set @@global.debug_dbug="+d,incomplete_group_in_relay_log";
 connection master;
 update tm as t1, ti as t2 set t1.a=t1.a * 2, t2.a=t2.a * 2;
@@ -135,7 +135,7 @@ eval SELECT "$error" AS Last_SQL_Error, @check as `true`;
 select max(a) as two from tm;
 select max(a) as one from ti;
-set @@global.debug="-d";
+set @@global.debug_dbug="-d";
 #
 # clean-up

--- a/mysql-test/include/binlog_inject_error.inc
+++ b/mysql-test/include/binlog_inject_error.inc
@@ -14,9 +14,9 @@
 # source include/binlog_inject_error.inc;
 #
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 --echo $query;
 --replace_regex /(errno: .*)/(errno: #)/
 --error ER_ERROR_ON_WRITE
 --eval $query
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
--- a/mysql-test/include/check-warnings.test
+++ b/mysql-test/include/check-warnings.test
@@ -14,7 +14,7 @@ set SQL_LOG_BIN=0;
 # Turn off any debug crashes, allow the variable to be
 # non existent in release builds
 --error 0,1193
-set debug="";
+set debug_dbug="";
 use mtr;

--- a/mysql-test/include/io_thd_fault_injection.inc
+++ b/mysql-test/include/io_thd_fault_injection.inc
@@ -8,13 +8,13 @@ SET @old_debug=@@global.debug;
 -- disable_warnings
 -- source include/stop_slave.inc 
 -- enable_warnings
-- eval SET GLOBAL debug="+d,$io_thd_injection_fault_flag"
+-- eval SET GLOBAL debug_dbug="+d,$io_thd_injection_fault_flag"
 START SLAVE io_thread;
 -- source include/wait_for_slave_io_error.inc
-- eval SET GLOBAL debug="-d,$io_thd_injection_fault_flag"
+-- eval SET GLOBAL debug_dbug="-d,$io_thd_injection_fault_flag"
-SET GLOBAL debug=@old_debug;
+SET GLOBAL debug_dbug=@old_debug;
 # restart because slave is in bad shape
 --let $rpl_server_number= 2

--- a/mysql-test/include/maria_verify_recovery.inc
+++ b/mysql-test/include/maria_verify_recovery.inc
@@ -32,7 +32,7 @@ system echo wait-maria_verify_recovery.inc >> $MYSQLTEST_VARDIR/tmp/mysqld.1.exp
 # but that would implicitely commit all work, which the tester may
 # not want (tester may want to observe rollback happening).
-eval SET SESSION debug=$mvr_debug_option;
+eval SET SESSION debug_dbug=$mvr_debug_option;
 --echo * crashing mysqld intentionally
 --error 2013
 eval $mvr_crash_statement; # this will crash (DBUG magic)

--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -214,7 +214,7 @@ my $opt_cursor_protocol;
 my $opt_view_protocol;
 our $opt_debug;
-my $debug_d= "d";
+my $debug_d= "d,*";
 my $opt_debug_common;
 our $opt_debug_server;
 our @opt_cases;                  # The test cases names in argv
@@ -3471,7 +3471,7 @@ sub mysql_install_db {
  if ( $opt_debug )
  {
-    mtr_add_arg($args, "--debug=$debug_d:t:i:A,%s/log/bootstrap.trace",
+    mtr_add_arg($args, "--debug-dbug=$debug_d:t:i:A,%s/log/bootstrap.trace",
 		$path_vardir_trace);
  }
@@ -5383,7 +5383,7 @@ sub mysqld_start ($$) {
  if ( $opt_debug )
  {
-    mtr_add_arg($args, "--debug=$debug_d:t:i:A,%s/log/%s.trace",
+    mtr_add_arg($args, "--debug-dbug=$debug_d:t:i:A,%s/log/%s.trace",
 		$path_vardir_trace, $mysqld->name());
  }

--- a/mysql-test/r/archive_debug.result
+++ b/mysql-test/r/archive_debug.result
@@ -4,9 +4,9 @@
 #
 CREATE TABLE t1(a INT) ENGINE=ARCHIVE;
 INSERT INTO t1 VALUES(1);
-SET SESSION debug='d,simulate_archive_open_failure';
+SET SESSION debug_dbug='d,simulate_archive_open_failure';
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	error	Corrupt
-SET SESSION debug=DEFAULT;
+SET SESSION debug_dbug=DEFAULT;
 DROP TABLE t1;
--- a/mysql-test/r/crash_commit_before.result
+++ b/mysql-test/r/crash_commit_before.result
 CREATE TABLE t1(a int) engine=innodb;
 START TRANSACTION;
 insert into t1 values(9);
-SET GLOBAL debug="d,crash_commit_before";
+SET GLOBAL debug_dbug="d,crash_commit_before";
 COMMIT;
 ERROR HY000: Lost connection to MySQL server during query
 SHOW CREATE TABLE t1;

--- a/mysql-test/r/drop_debug.result
+++ b/mysql-test/r/drop_debug.result
@@ -10,7 +10,7 @@ CREATE TABLE mysql_test.t1(a INT);
 CREATE TABLE mysql_test.t2(b INT);
 CREATE TABLE mysql_test.t3(c INT);
-SET SESSION DEBUG = "+d,bug43138";
+SET SESSION debug_dbug= "+d,bug43138";
 DROP DATABASE mysql_test;
 Warnings:
@@ -18,7 +18,7 @@ Error	1051	Unknown table 't1'
 Error	1051	Unknown table 't2'
 Error	1051	Unknown table 't3'
-SET SESSION DEBUG = "-d,bug43138";
+SET SESSION debug_dbug= "-d,bug43138";
 # --
 # -- End of Bug#43138.

--- a/mysql-test/r/error_simulation.result
+++ b/mysql-test/r/error_simulation.result
@@ -13,7 +13,7 @@ INSERT INTO t1 VALUES
 ('AAAAAAAAAH','AAAAAAAAAH'), ('AAAAAAAAAI','AAAAAAAAAI'),
 ('AAAAAAAAAJ','AAAAAAAAAJ'), ('AAAAAAAAAK','AAAAAAAAAK');
 set tmp_table_size=1024;
-set session debug="d,raise_error";
+set session debug_dbug="d,raise_error";
 SELECT MAX(a) FROM t1 GROUP BY a,b;
 ERROR 23000: Can't write; duplicate key in table 'tmp_table'
 set tmp_table_size=default;
@@ -23,9 +23,9 @@ DROP TABLE t1;
 #
 CREATE TABLE t1 (a INT(100) NOT NULL);
 INSERT INTO t1 VALUES (1), (0), (2);
-SET SESSION debug='+d,alter_table_only_index_change';
+SET SESSION debug_dbug='+d,alter_table_only_index_change';
 ALTER TABLE t1 ADD INDEX a(a);
-SET SESSION debug=DEFAULT;
+SET SESSION debug_dbug=DEFAULT;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -42,10 +42,10 @@ DROP TABLE t1;
 # Bug#42064: low memory crash when importing hex strings, in Item_hex_string::Item_hex_string
 #
 CREATE TABLE t1(a BLOB);
-SET SESSION debug="+d,bug42064_simulate_oom";
+SET SESSION debug_dbug="+d,bug42064_simulate_oom";
 INSERT INTO t1 VALUES("");
 Got one of the listed errors
-SET SESSION debug=DEFAULT;
+SET SESSION debug_dbug=DEFAULT;
 DROP TABLE t1;
 #
 # Bug#41660: Sort-index_merge for non-first join table may require 
@@ -62,7 +62,7 @@ INSERT INTO t2 VALUES (1, 1, 'data');
 # re-scanned for every record in the outer table. if we used inner join,
 # we would need to have thousands of records and/or more columns in both
 # tables so that the join buffer is filled and re-scans are triggered).
-SET SESSION debug = '+d,only_one_Unique_may_be_created';
+SET SESSION debug_dbug= '+d,only_one_Unique_may_be_created';
 EXPLAIN
 SELECT * FROM t1 LEFT JOIN t2 ON ( t2.a < 10 OR t2.b < 10 );
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -80,7 +80,7 @@ a	a	b	filler
 7	1	1	data
 8	1	1	data
 9	1	1	data
-SET SESSION debug = DEFAULT;
+SET SESSION debug_dbug= DEFAULT;
 DROP TABLE t1, t2;
 #
 # End of 5.1 tests

--- a/mysql-test/r/filesort_debug.result
+++ b/mysql-test/r/filesort_debug.result
@@ -4,11 +4,11 @@ SET @old_debug= @@session.debug;
 #
 CREATE TABLE t1(f0 int auto_increment primary key, f1 int);
 INSERT INTO t1(f1) VALUES (0),(1),(2),(3),(4),(5);
-SET session debug= '+d,make_char_array_fail';
+SET session debug_dbug= '+d,make_char_array_fail';
 CALL mtr.add_suppression("Out of sort memory");
 SELECT * FROM t1 ORDER BY f1 ASC, f0;
 ERROR HY001: Out of sort memory, consider increasing server sort buffer size
-SET session debug= @old_debug;
+SET session debug_dbug= @old_debug;
 CREATE FUNCTION f1() RETURNS INT RETURN 1;
 DELETE FROM t1 ORDER BY (f1(10)) LIMIT 1;
 ERROR 42000: Incorrect number of arguments for FUNCTION test.f1; expected 0, got 1

--- a/mysql-test/r/information_schema_all_engines.result
+++ b/mysql-test/r/information_schema_all_engines.result
@@ -36,29 +36,29 @@ TRIGGERS
 USER_PRIVILEGES
 USER_STATISTICS
 VIEWS
-INNODB_SYS_COLUMNS
+INNODB_CMPMEM_RESET
+PBXT_STATISTICS
+INNODB_CMPMEM
 INNODB_RSEG
-INNODB_CMP
-INNODB_TRX
 INNODB_SYS_TABLESTATS
 INNODB_LOCK_WAITS
-INNODB_BUFFER_POOL_PAGES_INDEX
+INNODB_INDEX_STATS
-INNODB_LOCKS
+INNODB_CMP
 INNODB_SYS_FOREIGN_COLS
 INNODB_CMP_RESET
 INNODB_BUFFER_POOL_PAGES
-INNODB_SYS_TABLES
+INNODB_TRX
-PBXT_STATISTICS
+INNODB_BUFFER_POOL_PAGES_INDEX
-INNODB_CMPMEM
+INNODB_LOCKS
 INNODB_BUFFER_POOL_PAGES_BLOB
-INNODB_CMPMEM_RESET
+INNODB_SYS_TABLES
 INNODB_SYS_FIELDS
-INNODB_TABLE_STATS
+INNODB_SYS_COLUMNS
+INNODB_SYS_STATS
 INNODB_SYS_FOREIGN
 INNODB_SYS_INDEXES
-INNODB_INDEX_STATS
 XTRADB_ADMIN_COMMAND
-INNODB_SYS_STATS
+INNODB_TABLE_STATS
 SELECT t.table_name, c1.column_name
 FROM information_schema.tables t
 INNER JOIN
@@ -109,29 +109,29 @@ TRIGGERS	TRIGGER_SCHEMA
 USER_PRIVILEGES	GRANTEE
 USER_STATISTICS	USER
 VIEWS	TABLE_SCHEMA
-INNODB_SYS_COLUMNS	TABLE_ID
+INNODB_CMPMEM_RESET	page_size
+PBXT_STATISTICS	ID
+INNODB_CMPMEM	page_size
 INNODB_RSEG	rseg_id
-INNODB_CMP	page_size
-INNODB_TRX	trx_id
 INNODB_SYS_TABLESTATS	SCHEMA
 INNODB_LOCK_WAITS	requesting_trx_id
-INNODB_BUFFER_POOL_PAGES_INDEX	index_id
+INNODB_INDEX_STATS	table_schema
-INNODB_LOCKS	lock_id
+INNODB_CMP	page_size
 INNODB_SYS_FOREIGN_COLS	ID
 INNODB_CMP_RESET	page_size
 INNODB_BUFFER_POOL_PAGES	page_type
-INNODB_SYS_TABLES	SCHEMA
+INNODB_TRX	trx_id
-PBXT_STATISTICS	ID
+INNODB_BUFFER_POOL_PAGES_INDEX	index_id
-INNODB_CMPMEM	page_size
+INNODB_LOCKS	lock_id
 INNODB_BUFFER_POOL_PAGES_BLOB	space_id
-INNODB_CMPMEM_RESET	page_size
+INNODB_SYS_TABLES	SCHEMA
 INNODB_SYS_FIELDS	INDEX_ID
-INNODB_TABLE_STATS	table_schema
+INNODB_SYS_COLUMNS	TABLE_ID
+INNODB_SYS_STATS	INDEX_ID
 INNODB_SYS_FOREIGN	ID
 INNODB_SYS_INDEXES	INDEX_ID
-INNODB_INDEX_STATS	table_schema
 XTRADB_ADMIN_COMMAND	result_message
-INNODB_SYS_STATS	INDEX_ID
+INNODB_TABLE_STATS	table_schema
 SELECT t.table_name, c1.column_name
 FROM information_schema.tables t
 INNER JOIN
@@ -182,29 +182,29 @@ TRIGGERS	TRIGGER_SCHEMA
 USER_PRIVILEGES	GRANTEE
 USER_STATISTICS	USER
 VIEWS	TABLE_SCHEMA
-INNODB_SYS_COLUMNS	TABLE_ID
+INNODB_CMPMEM_RESET	page_size
+PBXT_STATISTICS	ID
+INNODB_CMPMEM	page_size
 INNODB_RSEG	rseg_id
-INNODB_CMP	page_size
-INNODB_TRX	trx_id
 INNODB_SYS_TABLESTATS	SCHEMA
 INNODB_LOCK_WAITS	requesting_trx_id
-INNODB_BUFFER_POOL_PAGES_INDEX	index_id
+INNODB_INDEX_STATS	table_schema
-INNODB_LOCKS	lock_id
+INNODB_CMP	page_size
 INNODB_SYS_FOREIGN_COLS	ID
 INNODB_CMP_RESET	page_size
 INNODB_BUFFER_POOL_PAGES	page_type
-INNODB_SYS_TABLES	SCHEMA
+INNODB_TRX	trx_id
-PBXT_STATISTICS	ID
+INNODB_BUFFER_POOL_PAGES_INDEX	index_id
-INNODB_CMPMEM	page_size
+INNODB_LOCKS	lock_id
 INNODB_BUFFER_POOL_PAGES_BLOB	space_id
-INNODB_CMPMEM_RESET	page_size
+INNODB_SYS_TABLES	SCHEMA
 INNODB_SYS_FIELDS	INDEX_ID
-INNODB_TABLE_STATS	table_schema
+INNODB_SYS_COLUMNS	TABLE_ID
+INNODB_SYS_STATS	INDEX_ID
 INNODB_SYS_FOREIGN	ID
 INNODB_SYS_INDEXES	INDEX_ID
-INNODB_INDEX_STATS	table_schema
 XTRADB_ADMIN_COMMAND	result_message
-INNODB_SYS_STATS	INDEX_ID
+INNODB_TABLE_STATS	table_schema
 select 1 as f1 from information_schema.tables  where "CHARACTER_SETS"=
 (select cast(table_name as char)  from information_schema.tables
 order by table_name limit 1) limit 1;
@@ -322,29 +322,29 @@ Database: information_schema
 | USER_PRIVILEGES                       |
 | USER_STATISTICS                       |
 | VIEWS                                 |
-| INNODB_SYS_COLUMNS                    |
+| INNODB_CMPMEM_RESET                   |
+| PBXT_STATISTICS                       |
+| INNODB_CMPMEM                         |
 | INNODB_RSEG                           |
-| INNODB_CMP                            |
-| INNODB_TRX                            |
 | INNODB_SYS_TABLESTATS                 |
 | INNODB_LOCK_WAITS                     |
-| INNODB_BUFFER_POOL_PAGES_INDEX        |
+| INNODB_INDEX_STATS                    |
-| INNODB_LOCKS                          |
+| INNODB_CMP                            |
 | INNODB_SYS_FOREIGN_COLS               |
 | INNODB_CMP_RESET                      |
 | INNODB_BUFFER_POOL_PAGES              |
-| INNODB_SYS_TABLES                     |
+| INNODB_TRX                            |
-| PBXT_STATISTICS                       |
+| INNODB_BUFFER_POOL_PAGES_INDEX        |
-| INNODB_CMPMEM                         |
+| INNODB_LOCKS                          |
 | INNODB_BUFFER_POOL_PAGES_BLOB         |
-| INNODB_CMPMEM_RESET                   |
+| INNODB_SYS_TABLES                     |
 | INNODB_SYS_FIELDS                     |
-| INNODB_TABLE_STATS                    |
+| INNODB_SYS_COLUMNS                    |
+| INNODB_SYS_STATS                      |
 | INNODB_SYS_FOREIGN                    |
 | INNODB_SYS_INDEXES                    |
-| INNODB_INDEX_STATS                    |
 | XTRADB_ADMIN_COMMAND                  |
-| INNODB_SYS_STATS                      |
+| INNODB_TABLE_STATS                    |
 +---------------------------------------+
 Database: INFORMATION_SCHEMA
 +---------------------------------------+
@@ -385,29 +385,29 @@ Database: INFORMATION_SCHEMA
 | USER_PRIVILEGES                       |
 | USER_STATISTICS                       |
 | VIEWS                                 |
-| INNODB_SYS_COLUMNS                    |
+| INNODB_CMPMEM_RESET                   |
+| PBXT_STATISTICS                       |
+| INNODB_CMPMEM                         |
 | INNODB_RSEG                           |
-| INNODB_CMP                            |
-| INNODB_TRX                            |
 | INNODB_SYS_TABLESTATS                 |
 | INNODB_LOCK_WAITS                     |
-| INNODB_BUFFER_POOL_PAGES_INDEX        |
+| INNODB_INDEX_STATS                    |
-| INNODB_LOCKS                          |
+| INNODB_CMP                            |
 | INNODB_SYS_FOREIGN_COLS               |
 | INNODB_CMP_RESET                      |
 | INNODB_BUFFER_POOL_PAGES              |
-| INNODB_SYS_TABLES                     |
+| INNODB_TRX                            |
-| PBXT_STATISTICS                       |
+| INNODB_BUFFER_POOL_PAGES_INDEX        |
-| INNODB_CMPMEM                         |
+| INNODB_LOCKS                          |
 | INNODB_BUFFER_POOL_PAGES_BLOB         |
-| INNODB_CMPMEM_RESET                   |
+| INNODB_SYS_TABLES                     |
 | INNODB_SYS_FIELDS                     |
-| INNODB_TABLE_STATS                    |
+| INNODB_SYS_COLUMNS                    |
+| INNODB_SYS_STATS                      |
 | INNODB_SYS_FOREIGN                    |
 | INNODB_SYS_INDEXES                    |
-| INNODB_INDEX_STATS                    |
 | XTRADB_ADMIN_COMMAND                  |
-| INNODB_SYS_STATS                      |
+| INNODB_TABLE_STATS                    |
 +---------------------------------------+
 Wildcard: inf_rmation_schema
 +--------------------+

--- a/mysql-test/r/innodb_mysql_sync.result
+++ b/mysql-test/r/innodb_mysql_sync.result
@@ -173,7 +173,7 @@ DROP TABLE IF EXISTS t1;
 CREATE TABLE t1(a INT NOT NULL, b INT NOT NULL) engine=innodb;
 INSERT INTO t1 VALUES (1, 12345), (2, 23456);
 # Connection con1
-SET SESSION debug= "+d,alter_table_rollback_new_index";
+SET SESSION debug_dbug= "+d,alter_table_rollback_new_index";
 ALTER TABLE t1 ADD PRIMARY KEY(a);
 ERROR HY000: Unknown error
 SELECT * FROM t1;

--- a/mysql-test/r/log_tables_debug.result
+++ b/mysql-test/r/log_tables_debug.result
@@ -8,11 +8,11 @@ SET @old_slow_query_log_file= @@global.slow_query_log_file;
 #
 SET @@global.general_log = ON;
 SET @@global.general_log_file = 'bug45387_general.log';
-SET SESSION debug='+d,reset_log_last_time';
+SET SESSION debug_dbug='+d,reset_log_last_time';
 FLUSH LOGS;
 SET @@global.general_log = @old_general_log;
 SET @@global.general_log_file = @old_general_log_file;
-SET SESSION debug='-d';
+SET SESSION debug_dbug='-d';
 Bug#45387: ID match.
 End of 5.1 tests
 #

--- a/mysql-test/r/merge_debug.result
+++ b/mysql-test/r/merge_debug.result
@@ -10,9 +10,9 @@ INSERT INTO crashed VALUES (10);
 INSERT INTO t2 VALUES (20);
 INSERT INTO t3 VALUES (30);
 LOCK TABLES t3 WRITE, t2 WRITE, t4 WRITE, crashed WRITE;
-SET GLOBAL debug="+d,myisam_pretend_crashed_table_on_open";
+SET GLOBAL debug_dbug="+d,myisam_pretend_crashed_table_on_open";
 CREATE TRIGGER t1_ai AFTER INSERT ON crashed FOR EACH ROW INSERT INTO t2 VALUES(29);
-SET GLOBAL debug=@orig_debug;
+SET GLOBAL debug_dbug=@orig_debug;
 INSERT INTO t4 VALUES (39);
 ERROR HY000: Table 'crashed' was not locked with LOCK TABLES
 INSERT INTO crashed VALUES (11);

--- a/mysql-test/r/myisam_crash_before_flush_keys.result
+++ b/mysql-test/r/myisam_crash_before_flush_keys.result
@@ -12,7 +12,7 @@ PRIMARY KEY(a , b),
 KEY(b)) ENGINE=MyISAM DELAY_KEY_WRITE = 1;
 INSERT INTO t1 VALUES (1,2),(2,3),(3,4),(4,5),(5,6);
 # Setup the mysqld to crash at certain point
-SET SESSION debug="d,crash_before_flush_keys";
+SET SESSION debug_dbug="d,crash_before_flush_keys";
 # Write file to make mysql-test-run.pl expect crash
 # Run the crashing query
 FLUSH TABLE t1;

--- a/mysql-test/r/myisam_debug.result
+++ b/mysql-test/r/myisam_debug.result
@@ -13,7 +13,7 @@ KEY (id1), KEY(id)
 ) ENGINE=MyISAM;
 INSERT INTO t2 (id) VALUES (123);
 # Switch to insert Connection
-SET SESSION debug='+d,wait_in_enable_indexes';
+SET SESSION debug_dbug='+d,wait_in_enable_indexes';
 # Send insert data
 INSERT INTO t1(id) SELECT id  FROM t2;
 # Switch to default Connection

--- a/mysql-test/r/partition_debug_sync.result
+++ b/mysql-test/r/partition_debug_sync.result
@@ -18,7 +18,7 @@ ENGINE = MYISAM
 PARTITION p1 VALUES LESS THAN (20),
 PARTITION p2 VALUES LESS THAN (100),
 PARTITION p3 VALUES LESS THAN MAXVALUE ) */;
-SET SESSION debug= "+d,sleep_before_create_table_no_lock";
+SET SESSION debug_dbug= "+d,sleep_before_create_table_no_lock";
 SET DEBUG_SYNC= 'alter_table_before_create_table_no_lock SIGNAL removing_partitioning WAIT_FOR waiting_for_alter';
 SET DEBUG_SYNC= 'alter_table_before_main_binlog SIGNAL partitioning_removed';
 ALTER TABLE t1 REMOVE PARTITIONING;
@@ -28,7 +28,7 @@ SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL waiting_for_alter';
 SET DEBUG_SYNC= 'rm_table_no_locks_before_delete_table WAIT_FOR partitioning_removed';
 DROP TABLE IF EXISTS t1;
 # Con 1
-SET SESSION debug= "-d,sleep_before_create_table_no_lock";
+SET SESSION debug_dbug= "-d,sleep_before_create_table_no_lock";
 SET DEBUG_SYNC= 'RESET';
 SET DEBUG_SYNC= 'RESET';
 #
@@ -51,12 +51,12 @@ SET DEBUG_SYNC= 'alter_table_before_open_tables SIGNAL removing_partitions WAIT_
 SET DEBUG_SYNC= 'alter_table_before_rename_result_table WAIT_FOR delete_done';
 ALTER TABLE t2 REMOVE PARTITIONING;
 # Con default
-SET SESSION debug= "+d,sleep_before_no_locks_delete_table";
+SET SESSION debug_dbug= "+d,sleep_before_no_locks_delete_table";
 SET DEBUG_SYNC= 'now WAIT_FOR removing_partitions';
 SET DEBUG_SYNC= 'rm_table_no_locks_before_delete_table SIGNAL waiting_for_alter';
 SET DEBUG_SYNC= 'rm_table_no_locks_before_binlog SIGNAL delete_done';
 DROP TABLE IF EXISTS t2;
-SET SESSION debug= "-d,sleep_before_no_locks_delete_table";
+SET SESSION debug_dbug= "-d,sleep_before_no_locks_delete_table";
 # Con 1
 ERROR 42S02: Table 'test.t2' doesn't exist
 SET DEBUG_SYNC= 'RESET';

--- a/mysql-test/r/partition_sync.result
+++ b/mysql-test/r/partition_sync.result
@@ -41,7 +41,7 @@ i
 1
 # Connection 2
 # Alter table, abort after prepare
-set session debug="+d,abort_copy_table";
+set session debug_dbug="+d,abort_copy_table";
 ALTER TABLE tbl_with_partitions ADD COLUMN f INT;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 # Connection 1

--- a/mysql-test/r/select_debug.result
+++ b/mysql-test/r/select_debug.result
@@ -6,7 +6,7 @@ insert into t1 values (2,2), (1,1);
 create table t2 (a int);
 insert into t2 values (2), (3);
 set session join_cache_level=3;
-set @@debug = 'd:t:O,/tmp/trace.out';
+set @@debug_dbug= 'd:t:O,/tmp/trace.out';
 explain select t1.b from t1,t2 where t1.b=t2.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

--- a/mysql-test/r/sp-code.result
+++ b/mysql-test/r/sp-code.result
@@ -923,7 +923,7 @@ END;
 CLOSE c;
 SELECT a INTO @foo FROM t1 LIMIT 1; # Clear warning stack
 END|
-SET SESSION debug="+d,bug23032_emit_warning";
+SET SESSION debug_dbug="+d,bug23032_emit_warning";
 CALL p1();
 Warning found!
 Warning found!
@@ -942,6 +942,6 @@ End of Result Set found!
 Level	Code	Message
 Warning	1105	Unknown error
 Error	1329	No data - zero rows fetched, selected, or processed
-SET SESSION debug="-d,bug23032_emit_warning";
+SET SESSION debug_dbug="-d,bug23032_emit_warning";
 DROP PROCEDURE p1;
 DROP TABLE t1;
--- a/mysql-test/r/sp-no-code.result
+++ b/mysql-test/r/sp-no-code.result
 show procedure code foo;
-ERROR HY000: The 'SHOW PROCEDURE|FUNCTION CODE' feature is disabled; you need MySQL built with '--with-debug' to have it working
+ERROR HY000: The 'SHOW PROCEDURE|FUNCTION CODE' feature is disabled; you need MariaDB built with '--with-debug' to have it working
 show function code foo;
-ERROR HY000: The 'SHOW PROCEDURE|FUNCTION CODE' feature is disabled; you need MySQL built with '--with-debug' to have it working
+ERROR HY000: The 'SHOW PROCEDURE|FUNCTION CODE' feature is disabled; you need MariaDB built with '--with-debug' to have it working
--- a/mysql-test/r/subselect_debug.result
+++ b/mysql-test/r/subselect_debug.result
@@ -2,12 +2,12 @@ CREATE TABLE t1(id INT);
 INSERT INTO t1 VALUES (1),(2),(3),(4);
 INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d;
 SET @orig_debug=@@debug;
-SET GLOBAL debug="d,subselect_exec_fail";
+SET GLOBAL debug_dbug="d,subselect_exec_fail";
 SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1;
 SUM(EXISTS(SELECT RAND() FROM t1))
 0
 SELECT REVERSE(EXISTS(SELECT RAND() FROM t1));
 REVERSE(EXISTS(SELECT RAND() FROM t1))
 0
-SET GLOBAL debug=@orig_debug;
+SET GLOBAL debug_dbug=@orig_debug;
 DROP TABLE t1;
--- a/mysql-test/r/variables_debug.result
+++ b/mysql-test/r/variables_debug.result
 SET @old_debug = @@GLOBAL.debug;
-set debug= 'T';
+set debug_dbug= 'T';
 select @@debug;
 @@debug
 T
-set debug= '+P';
+set debug_dbug= '+P';
 select @@debug;
 @@debug
 P:T
-set debug= '-P';
+set debug_dbug= '-P';
 select @@debug;
 @@debug
 T
 SELECT @@session.debug, @@global.debug;
 @@session.debug	@@global.debug
 T	
-SET SESSION debug = '';
+SET SESSION debug_dbug= '';
 SELECT @@session.debug, @@global.debug;
 @@session.debug	@@global.debug
@@ -22,28 +22,28 @@ SELECT @@session.debug, @@global.debug;
 # Bug #52629: memory leak from sys_var_thd_dbug in 
 #  binlog.binlog_write_error
 #
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 SELECT @@global.debug;
 @@global.debug
 d,injecting_fault_writing
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
 SELECT @@global.debug;
 @@global.debug
-SET GLOBAL debug=@old_debug;
+SET GLOBAL debug_dbug=@old_debug;
 #
 # Bug #56709: Memory leaks at running the 5.1 test suite
 # 
 SET @old_local_debug = @@debug;
-SET @@debug='d,foo';
+SET @@debug_dbug='d,foo';
 SELECT @@debug;
 @@debug
 d,foo
-SET @@debug='';
+SET @@debug_dbug='';
 SELECT @@debug;
 @@debug
-SET @@debug = @old_local_debug;
+SET @@debug_dbug= @old_local_debug;
 End of 5.1 tests
 #
 # Bug#46165 server crash in dbug
@@ -51,41 +51,41 @@ End of 5.1 tests
 SET @old_globaldebug = @@global.debug;
 SET @old_sessiondebug= @@session.debug;
 # Test 1 - Bug test case, single connection
-SET GLOBAL  debug= '+O,../../log/bug46165.1.trace';
+SET GLOBAL  debug_dbug= '+O,../../log/bug46165.1.trace';
-SET SESSION debug= '-d:-t:-i';
+SET SESSION debug_dbug= '-d:-t:-i';
-SET GLOBAL  debug= '';
+SET GLOBAL  debug_dbug= '';
-SET SESSION debug= '';
+SET SESSION debug_dbug= '';
 # Test 2 - Bug test case, two connections
 # Connection default
-SET GLOBAL  debug= '+O,../../log/bug46165.2.trace';
+SET GLOBAL  debug_dbug= '+O,../../log/bug46165.2.trace';
-SET SESSION debug= '-d:-t:-i';
+SET SESSION debug_dbug= '-d:-t:-i';
 # Connection con1
-SET GLOBAL  debug= '';
+SET GLOBAL  debug_dbug= '';
 # Connection default
-SET SESSION debug= '';
+SET SESSION debug_dbug= '';
 # Connection con1
 # Connection default
-SET GLOBAL  debug= '';
+SET GLOBAL  debug_dbug= '';
 # Test 3 - Active session trace file on disconnect
 # Connection con1
-SET GLOBAL  debug= '+O,../../log/bug46165.3.trace';
+SET GLOBAL  debug_dbug= '+O,../../log/bug46165.3.trace';
-SET SESSION debug= '-d:-t:-i';
+SET SESSION debug_dbug= '-d:-t:-i';
-SET GLOBAL  debug= '';
+SET GLOBAL  debug_dbug= '';
 # Test 4 - Active session trace file on two connections
 # Connection default
-SET GLOBAL  debug= '+O,../../log/bug46165.4.trace';
+SET GLOBAL  debug_dbug= '+O,../../log/bug46165.4.trace';
-SET SESSION debug= '-d:-t:-i';
+SET SESSION debug_dbug= '-d:-t:-i';
 # Connection con1
-SET SESSION debug= '-d:-t:-i';
+SET SESSION debug_dbug= '-d:-t:-i';
-SET GLOBAL  debug= '';
+SET GLOBAL  debug_dbug= '';
-SET SESSION debug= '';
+SET SESSION debug_dbug= '';
 # Connection default
-SET SESSION debug= '';
+SET SESSION debug_dbug= '';
 # Connection con1
 # Connection default
 # Test 5 - Different trace files
-SET SESSION debug= '+O,../../log/bug46165.5.trace';
+SET SESSION debug_dbug= '+O,../../log/bug46165.5.trace';
-SET SESSION debug= '+O,../../log/bug46165.6.trace';
+SET SESSION debug_dbug= '+O,../../log/bug46165.6.trace';
-SET SESSION debug= '-O';
+SET SESSION debug_dbug= '-O';
-SET GLOBAL  debug= @old_globaldebug;
+SET GLOBAL  debug_dbug= @old_globaldebug;
-SET SESSION debug= @old_sessiondebug;
+SET SESSION debug_dbug= @old_sessiondebug;
--- a/mysql-test/r/variables_debug_notembedded.result
+++ b/mysql-test/r/variables_debug_notembedded.result
-set session debug="t";
+set session debug_dbug="t";
 show session variables like 'debug';
 Variable_name	Value
 debug	t
-set session debug="t";
+set session debug_dbug="t";
 show session variables like 'debug';
 Variable_name	Value
 debug	t
-set session debug="d:t";
+set session debug_dbug="d:t";
 show session variables like 'debug';
 Variable_name	Value
 debug	d:t

--- a/mysql-test/r/warnings_debug.result
+++ b/mysql-test/r/warnings_debug.result
 drop table if exists t1;
 create table t1 (a int primary key) engine=innodb;
-SET SESSION debug="+d,warn_during_ha_commit_trans";
+SET SESSION debug_dbug="+d,warn_during_ha_commit_trans";
 INSERT INTO t1 VALUES (1);
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back

--- a/mysql-test/suite/binlog/r/binlog_index.result
+++ b/mysql-test/suite/binlog/r/binlog_index.result
@@ -47,7 +47,7 @@ Error	1377	Fatal error during log purge
 reset master;
 # crash_purge_before_update_index
 flush logs;
-SET SESSION debug="+d,crash_purge_before_update_index";
+SET SESSION debug_dbug="+d,crash_purge_before_update_index";
 purge binary logs TO 'master-bin.000002';
 ERROR HY000: Lost connection to MySQL server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
@@ -59,7 +59,7 @@ master-bin.000003
 # crash_purge_non_critical_after_update_index
 flush logs;
-SET SESSION debug="+d,crash_purge_non_critical_after_update_index";
+SET SESSION debug_dbug="+d,crash_purge_non_critical_after_update_index";
 purge binary logs TO 'master-bin.000004';
 ERROR HY000: Lost connection to MySQL server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
@@ -70,7 +70,7 @@ master-bin.000005
 # crash_purge_critical_after_update_index
 flush logs;
-SET SESSION debug="+d,crash_purge_critical_after_update_index";
+SET SESSION debug_dbug="+d,crash_purge_critical_after_update_index";
 purge binary logs TO 'master-bin.000006';
 ERROR HY000: Lost connection to MySQL server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
@@ -80,7 +80,7 @@ master-bin.000006
 master-bin.000007
 # crash_create_non_critical_before_update_index
-SET SESSION debug="+d,crash_create_non_critical_before_update_index";
+SET SESSION debug_dbug="+d,crash_create_non_critical_before_update_index";
 flush logs;
 ERROR HY000: Lost connection to MySQL server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
@@ -91,7 +91,7 @@ master-bin.000007
 master-bin.000008
 # crash_create_critical_before_update_index
-SET SESSION debug="+d,crash_create_critical_before_update_index";
+SET SESSION debug_dbug="+d,crash_create_critical_before_update_index";
 flush logs;
 ERROR HY000: Lost connection to MySQL server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
@@ -103,7 +103,7 @@ master-bin.000008
 master-bin.000009
 # crash_create_after_update_index
-SET SESSION debug="+d,crash_create_after_update_index";
+SET SESSION debug_dbug="+d,crash_create_after_update_index";
 flush logs;
 ERROR HY000: Lost connection to MySQL server during query
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
@@ -132,7 +132,7 @@ master-bin.000010
 master-bin.000011
 # fault_injection_registering_index
-SET SESSION debug="+d,fault_injection_registering_index";
+SET SESSION debug_dbug="+d,fault_injection_registering_index";
 flush logs;
 ERROR HY000: Can't open file: 'master-bin.000012' (errno: 1)
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
@@ -157,7 +157,7 @@ master-bin.000011
 master-bin.000012
 # fault_injection_updating_index
-SET SESSION debug="+d,fault_injection_updating_index";
+SET SESSION debug_dbug="+d,fault_injection_updating_index";
 flush logs;
 ERROR HY000: Can't open file: 'master-bin.000013' (errno: 1)
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
@@ -183,5 +183,5 @@ master-bin.000011
 master-bin.000012
 master-bin.000013
-SET SESSION debug="";
+SET SESSION debug_dbug="";
 End of tests
--- a/mysql-test/suite/binlog/r/binlog_ioerr.result
+++ b/mysql-test/suite/binlog/r/binlog_ioerr.result
@@ -2,12 +2,12 @@ CALL mtr.add_suppression("Error writing file 'master-bin'");
 RESET MASTER;
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=innodb;
 INSERT INTO t1 VALUES(0);
-SET SESSION debug='+d,fail_binlog_write_1';
+SET SESSION debug_dbug='+d,fail_binlog_write_1';
 INSERT INTO t1 VALUES(1);
 ERROR HY000: Error writing file 'master-bin' (errno: 28)
 INSERT INTO t1 VALUES(2);
 ERROR HY000: Error writing file 'master-bin' (errno: 28)
-SET SESSION debug='';
+SET SESSION debug_dbug='';
 INSERT INTO t1 VALUES(3);
 SELECT * FROM t1;
 a

--- a/mysql-test/suite/binlog/r/binlog_write_error.result
+++ b/mysql-test/suite/binlog/r/binlog_write_error.result
@@ -12,92 +12,92 @@ DROP VIEW IF EXISTS v1, v2;
 #
 # Test injecting binlog write error when executing queries
 #
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 CREATE TABLE t1 (a INT);
 CREATE TABLE t1 (a INT);
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
 INSERT INTO t1 VALUES (1),(2),(3);
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 INSERT INTO t1 VALUES (4),(5),(6);
 INSERT INTO t1 VALUES (4),(5),(6);
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 UPDATE t1 set a=a+1;
 UPDATE t1 set a=a+1;
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 DELETE FROM t1;
 DELETE FROM t1;
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 CREATE TRIGGER tr1 AFTER INSERT ON t1 FOR EACH ROW INSERT INTO t1 VALUES (new.a + 100);
 CREATE TRIGGER tr1 AFTER INSERT ON t1 FOR EACH ROW INSERT INTO t1 VALUES (new.a + 100);
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 DROP TRIGGER tr1;
 DROP TRIGGER tr1;
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 ALTER TABLE t1 ADD (b INT);
 ALTER TABLE t1 ADD (b INT);
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 CREATE VIEW v1 AS SELECT a FROM t1;
 CREATE VIEW v1 AS SELECT a FROM t1;
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 DROP VIEW v1;
 DROP VIEW v1;
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 CREATE PROCEDURE p1(OUT rows INT) SELECT count(*) INTO rows FROM t1;
 CREATE PROCEDURE p1(OUT rows INT) SELECT count(*) INTO rows FROM t1;
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 DROP PROCEDURE p1;
 DROP PROCEDURE p1;
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 DROP TABLE t1;
 DROP TABLE t1;
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 CREATE FUNCTION f1() RETURNS INT return 1;
 CREATE FUNCTION f1() RETURNS INT return 1;
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 DROP FUNCTION f1;
 DROP FUNCTION f1;
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 CREATE USER user1;
 CREATE USER user1;
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1;
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1;
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
-SET GLOBAL debug='d,injecting_fault_writing';
+SET GLOBAL debug_dbug='d,injecting_fault_writing';
 DROP USER user1;
 DROP USER user1;
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
-SET GLOBAL debug='';
+SET GLOBAL debug_dbug='';
 #
 # Cleanup
 #

--- a/mysql-test/suite/binlog/t/binlog_index.test
+++ b/mysql-test/suite/binlog/t/binlog_index.test
@@ -90,7 +90,7 @@ reset master;
 flush logs;
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-SET SESSION debug="+d,crash_purge_before_update_index";
+SET SESSION debug_dbug="+d,crash_purge_before_update_index";
 --error 2013
 purge binary logs TO 'master-bin.000002';
@@ -110,7 +110,7 @@ SELECT @index;
 flush logs;
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-SET SESSION debug="+d,crash_purge_non_critical_after_update_index";
+SET SESSION debug_dbug="+d,crash_purge_non_critical_after_update_index";
 --error 2013
 purge binary logs TO 'master-bin.000004';
@@ -133,7 +133,7 @@ SELECT @index;
 flush logs;
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-SET SESSION debug="+d,crash_purge_critical_after_update_index";
+SET SESSION debug_dbug="+d,crash_purge_critical_after_update_index";
 --error 2013
 purge binary logs TO 'master-bin.000006';
@@ -156,7 +156,7 @@ SELECT @index;
 --echo # crash_create_non_critical_before_update_index
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-SET SESSION debug="+d,crash_create_non_critical_before_update_index";
+SET SESSION debug_dbug="+d,crash_create_non_critical_before_update_index";
 --error 2013
 flush logs;
@@ -174,7 +174,7 @@ SELECT @index;
 --echo # crash_create_critical_before_update_index
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-SET SESSION debug="+d,crash_create_critical_before_update_index";
+SET SESSION debug_dbug="+d,crash_create_critical_before_update_index";
 --error 2013
 flush logs;
@@ -194,7 +194,7 @@ SELECT @index;
 --echo # crash_create_after_update_index
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-SET SESSION debug="+d,crash_create_after_update_index";
+SET SESSION debug_dbug="+d,crash_create_after_update_index";
 --error 2013
 flush logs;
@@ -222,7 +222,7 @@ SELECT @index;
 SELECT @index;
 --echo # fault_injection_registering_index
-SET SESSION debug="+d,fault_injection_registering_index";
+SET SESSION debug_dbug="+d,fault_injection_registering_index";
 -- replace_regex /\.[\\\/]master/master/
 -- error ER_CANT_OPEN_FILE
 flush logs;
@@ -242,7 +242,7 @@ SELECT @index;
 SELECT @index;
 --echo # fault_injection_updating_index
-SET SESSION debug="+d,fault_injection_updating_index";
+SET SESSION debug_dbug="+d,fault_injection_updating_index";
 -- replace_regex /\.[\\\/]master/master/
 -- error ER_CANT_OPEN_FILE
 flush logs;
@@ -261,6 +261,6 @@ SELECT @index;
 -- replace_regex /\.[\\\/]master/master/
 SELECT @index;
-eval SET SESSION debug="$old";
+eval SET SESSION debug_dbug="$old";
 --echo End of tests
--- a/mysql-test/suite/binlog/t/binlog_ioerr.test
+++ b/mysql-test/suite/binlog/t/binlog_ioerr.test
@@ -9,12 +9,12 @@ RESET MASTER;
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=innodb;
 INSERT INTO t1 VALUES(0);
-SET SESSION debug='+d,fail_binlog_write_1';
+SET SESSION debug_dbug='+d,fail_binlog_write_1';
 --error ER_ERROR_ON_WRITE
 INSERT INTO t1 VALUES(1);
 --error ER_ERROR_ON_WRITE
 INSERT INTO t1 VALUES(2);
-SET SESSION debug='';
+SET SESSION debug_dbug='';
 INSERT INTO t1 VALUES(3);
 SELECT * FROM t1;

--- a/mysql-test/suite/binlog/t/binlog_reset_master.test
+++ b/mysql-test/suite/binlog/t/binlog_reset_master.test
@@ -15,7 +15,7 @@
 # We use sleep, not debug_sync, because the sync point needs to be in
 # the thread shut down code after the debug sync facility has been
 # shut down.
--let $write_var= SET DEBUG="+d,sleep_after_lock_thread_count_before_delete_thd"; CREATE TEMPORARY TABLE test.t1 (a INT);
+--let $write_var= SET debug_dbug="+d,sleep_after_lock_thread_count_before_delete_thd"; CREATE TEMPORARY TABLE test.t1 (a INT);
 --let $write_to_file= GENERATE
 --disable_query_log
 --source include/write_var_to_file.inc

--- a/mysql-test/suite/innodb/r/group_commit_binlog_pos.result
+++ b/mysql-test/suite/innodb/r/group_commit_binlog_pos.result
@@ -19,7 +19,7 @@ a
 0
 1
 2
-SET SESSION debug="+d,crash_dispatch_command_before";
+SET SESSION debug_dbug="+d,crash_dispatch_command_before";
 SELECT 1;
 Got one of the listed errors
 Got one of the listed errors

--- a/mysql-test/suite/innodb/r/group_commit_binlog_pos_no_optimize_thread.result
+++ b/mysql-test/suite/innodb/r/group_commit_binlog_pos_no_optimize_thread.result
@@ -21,7 +21,7 @@ a
 0
 1
 2
-SET SESSION debug="+d,crash_dispatch_command_before";
+SET SESSION debug_dbug="+d,crash_dispatch_command_before";
 SELECT 1;
 Got one of the listed errors
 Got one of the listed errors

--- a/mysql-test/suite/innodb/r/group_commit_crash.result
+++ b/mysql-test/suite/innodb/r/group_commit_crash.result
@@ -8,11 +8,11 @@ create table t2 like t1;
 create procedure setcrash(IN i INT)
 begin
 CASE i
-WHEN 1 THEN SET SESSION debug="d,crash_commit_after_prepare";
+WHEN 1 THEN SET SESSION debug_dbug="d,crash_commit_after_prepare";
-WHEN 2 THEN SET SESSION debug="d,crash_commit_after_log";
+WHEN 2 THEN SET SESSION debug_dbug="d,crash_commit_after_log";
-WHEN 3 THEN SET SESSION debug="d,crash_commit_before_unlog";
+WHEN 3 THEN SET SESSION debug_dbug="d,crash_commit_before_unlog";
-WHEN 4 THEN SET SESSION debug="d,crash_commit_after";
+WHEN 4 THEN SET SESSION debug_dbug="d,crash_commit_after";
-WHEN 5 THEN SET SESSION debug="d,crash_commit_before";
+WHEN 5 THEN SET SESSION debug_dbug="d,crash_commit_before";
 ELSE BEGIN END;
 END CASE;
 end //

--- a/mysql-test/suite/innodb/r/group_commit_crash_no_optimize_thread.result
+++ b/mysql-test/suite/innodb/r/group_commit_crash_no_optimize_thread.result
@@ -8,11 +8,11 @@ create table t2 like t1;
 create procedure setcrash(IN i INT)
 begin
 CASE i
-WHEN 1 THEN SET SESSION debug="d,crash_commit_after_prepare";
+WHEN 1 THEN SET SESSION debug_dbug="d,crash_commit_after_prepare";
-WHEN 2 THEN SET SESSION debug="d,crash_commit_after_log";
+WHEN 2 THEN SET SESSION debug_dbug="d,crash_commit_after_log";
-WHEN 3 THEN SET SESSION debug="d,crash_commit_before_unlog";
+WHEN 3 THEN SET SESSION debug_dbug="d,crash_commit_before_unlog";
-WHEN 4 THEN SET SESSION debug="d,crash_commit_after";
+WHEN 4 THEN SET SESSION debug_dbug="d,crash_commit_after";
-WHEN 5 THEN SET SESSION debug="d,crash_commit_before";
+WHEN 5 THEN SET SESSION debug_dbug="d,crash_commit_before";
 ELSE BEGIN END;
 END CASE;
 end //

--- a/mysql-test/suite/innodb/r/innodb_bug53756.result
+++ b/mysql-test/suite/innodb/r/innodb_bug53756.result
@@ -92,7 +92,7 @@ pk	c1
 # Crash server.
 START TRANSACTION;
 INSERT INTO bug_53756 VALUES (666,666);
-SET SESSION debug="+d,crash_commit_before";
+SET SESSION debug_dbug="+d,crash_commit_before";
 COMMIT;
 ERROR HY000: Lost connection to MySQL server during query

--- a/mysql-test/suite/innodb/t/group_commit_binlog_pos.test
+++ b/mysql-test/suite/innodb/t/group_commit_binlog_pos.test
@@ -58,7 +58,7 @@ reap;
 # Now crash the server with 1+2 in-memory committed, 3 only prepared.
 connection default;
 system echo wait-group_commit_binlog_pos.test >> $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
-SET SESSION debug="+d,crash_dispatch_command_before";
+SET SESSION debug_dbug="+d,crash_dispatch_command_before";
 --error 2006,2013
 SELECT 1;

--- a/mysql-test/suite/innodb/t/group_commit_binlog_pos_no_optimize_thread.test
+++ b/mysql-test/suite/innodb/t/group_commit_binlog_pos_no_optimize_thread.test
@@ -62,7 +62,7 @@ reap;
 # Now crash the server with 1+2 in-memory committed, 3 only prepared.
 connection default;
 system echo wait-group_commit_binlog_pos_no_optimize_thread.test >> $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
-SET SESSION debug="+d,crash_dispatch_command_before";
+SET SESSION debug_dbug="+d,crash_dispatch_command_before";
 --error 2006,2013
 SELECT 1;

--- a/mysql-test/suite/innodb/t/group_commit_crash.test
+++ b/mysql-test/suite/innodb/t/group_commit_crash.test
@@ -20,11 +20,11 @@ delimiter //;
 create procedure setcrash(IN i INT)
 begin
  CASE i
-    WHEN 1 THEN SET SESSION debug="d,crash_commit_after_prepare";
+    WHEN 1 THEN SET SESSION debug_dbug="d,crash_commit_after_prepare";
-    WHEN 2 THEN SET SESSION debug="d,crash_commit_after_log";
+    WHEN 2 THEN SET SESSION debug_dbug="d,crash_commit_after_log";
-    WHEN 3 THEN SET SESSION debug="d,crash_commit_before_unlog";
+    WHEN 3 THEN SET SESSION debug_dbug="d,crash_commit_before_unlog";
-    WHEN 4 THEN SET SESSION debug="d,crash_commit_after";
+    WHEN 4 THEN SET SESSION debug_dbug="d,crash_commit_after";
-    WHEN 5 THEN SET SESSION debug="d,crash_commit_before";
+    WHEN 5 THEN SET SESSION debug_dbug="d,crash_commit_before";
    ELSE BEGIN END;
  END CASE;
 end //

--- a/mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test
+++ b/mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test
@@ -20,11 +20,11 @@ delimiter //;
 create procedure setcrash(IN i INT)
 begin
  CASE i
-    WHEN 1 THEN SET SESSION debug="d,crash_commit_after_prepare";
+    WHEN 1 THEN SET SESSION debug_dbug="d,crash_commit_after_prepare";
-    WHEN 2 THEN SET SESSION debug="d,crash_commit_after_log";
+    WHEN 2 THEN SET SESSION debug_dbug="d,crash_commit_after_log";
-    WHEN 3 THEN SET SESSION debug="d,crash_commit_before_unlog";
+    WHEN 3 THEN SET SESSION debug_dbug="d,crash_commit_before_unlog";
-    WHEN 4 THEN SET SESSION debug="d,crash_commit_after";
+    WHEN 4 THEN SET SESSION debug_dbug="d,crash_commit_after";
-    WHEN 5 THEN SET SESSION debug="d,crash_commit_before";
+    WHEN 5 THEN SET SESSION debug_dbug="d,crash_commit_before";
    ELSE BEGIN END;
  END CASE;
 end //

--- a/mysql-test/suite/innodb/t/innodb_bug53756.test
+++ b/mysql-test/suite/innodb/t/innodb_bug53756.test
@@ -134,7 +134,7 @@ START TRANSACTION;
 INSERT INTO bug_53756 VALUES (666,666);
 #
 # Request a crash on next execution of commit.
-SET SESSION debug="+d,crash_commit_before";
+SET SESSION debug_dbug="+d,crash_commit_before";
 #
 # Execute the statement that causes the crash.
 --error 2013

--- a/mysql-test/suite/maria/r/maria-recovery-bitmap.result
+++ b/mysql-test/suite/maria/r/maria-recovery-bitmap.result
@@ -9,10 +9,10 @@ flush table t1;
 * copied t1 for comparison
 insert into t1 values ("bbbbbbb");
 delete from t1 limit 1;
-set session debug="+d,info,enter,exit,maria_over_alloc_bitmap";
+set session debug_dbug="+d,info,enter,exit,maria_over_alloc_bitmap";
 insert into t1 values ("aaaaaaaaa");
 set global aria_checkpoint_interval=1;
-SET SESSION debug="+d,maria_crash";
+SET SESSION debug_dbug="+d,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -29,7 +29,7 @@ flush table t1;
 * copied t1 for comparison
 lock tables t1 write;
 insert into t1 values (REPEAT('a', 6000));
-SET SESSION debug="+d,maria_flush_bitmap,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_bitmap,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query

--- a/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result
+++ b/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result
@@ -25,7 +25,7 @@ flush table t2;
 * copied t2 for comparison
 flush table t1;
 * copied t1 for comparison
-SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -51,7 +51,7 @@ flush table t2;
 flush table t1;
 * copied t1 for comparison
 lock tables t1 write, t2 write;
-SET SESSION debug="+d,maria_crash";
+SET SESSION debug_dbug="+d,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -74,7 +74,7 @@ flush table t2;
 flush table t1;
 * copied t1 for comparison
 lock tables t1 write, t2 write;
-SET SESSION debug="+d,maria_flush_whole_page_cache,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_page_cache,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -97,7 +97,7 @@ flush table t2;
 flush table t1;
 * copied t1 for comparison
 lock tables t1 write, t2 write;
-SET SESSION debug="+d,maria_flush_states,maria_flush_whole_log,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_states,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -120,7 +120,7 @@ flush table t2;
 flush table t1;
 * copied t1 for comparison
 lock tables t1 write, t2 write;
-SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -138,7 +138,7 @@ mysqltest.t1	check	status	OK
 Checksum-check
 ok
 use mysqltest;
-SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query

--- a/mysql-test/suite/maria/r/maria-recovery.result
+++ b/mysql-test/suite/maria/r/maria-recovery.result
@@ -9,7 +9,7 @@ create table t1 (a varchar(1000)) engine=aria;
 insert into t1 values ("00000000");
 flush table t1;
 * copied t1 for comparison
-SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -32,7 +32,7 @@ flush table t1;
 * copied t1 for comparison
 lock tables t1 write;
 insert into t1 values ("aaaaaaaaa");
-SET SESSION debug="+d,maria_crash";
+SET SESSION debug_dbug="+d,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -53,7 +53,7 @@ flush table t1;
 * copied t1 for comparison
 lock tables t1 write;
 insert into t1 values ("aaaaaaaaa");
-SET SESSION debug="+d,maria_flush_whole_page_cache,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_page_cache,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -75,7 +75,7 @@ flush table t1;
 * copied t1 for comparison
 lock tables t1 write;
 insert into t1 values ("aaaaaaaaa");
-SET SESSION debug="+d,maria_flush_states,maria_flush_whole_log,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_states,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -98,7 +98,7 @@ flush table t1;
 * copied t1 for comparison
 lock tables t1 write;
 insert into t1 values ("aaaaaaaaa");
-SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -133,7 +133,7 @@ LENGTH(b)
 5001
 flush table t1;
 * copied t1 for comparison
-SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -163,7 +163,7 @@ insert into t1 values(null,"a"), (null,"c"), (null,"d");
 delete from t1 where c="d";
 flush table t1;
 * copied t1 for comparison
-SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -189,7 +189,7 @@ t1	CREATE TABLE `t1` (
 update t1 set i=15 where c="a";
 flush table t1;
 * copied t1 for comparison
-SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -215,7 +215,7 @@ flush table t1;
 * copied t1 for comparison
 lock tables t1 write;
 insert into t1 values(null, "e");
-SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query

--- a/mysql-test/suite/maria/r/maria-recovery2.result
+++ b/mysql-test/suite/maria/r/maria-recovery2.result
@@ -14,7 +14,7 @@ flush table t1;
 lock tables t1 write;
 insert into t1 values(3);
 delete from t1 where a in (1,2,3);
-SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -28,7 +28,7 @@ ok
 use mysqltest;
 drop table t1;
 * TEST of checkpoint
-set global debug="+d,info,query,enter,exit,loop,maria_checkpoint_indirect";
+set global debug_dbug="+d,info,query,enter,exit,loop,maria_checkpoint_indirect";
 set global aria_checkpoint_interval=10000;
 create table t1(a int, b varchar(10), index(a,b)) engine=aria;
 insert into t1 values(1,"a"),(2,"b"),(3,"c");
@@ -45,7 +45,7 @@ Variable_name	Value
 Aria_pagecache_blocks_not_flushed	3
 set global aria_checkpoint_interval=10000;
 update t1 set b="i" where a=5;
-SET SESSION debug="+d,maria_crash";
+SET SESSION debug_dbug="+d,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -74,7 +74,7 @@ a
 1
 2
 3
-SET SESSION debug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -107,7 +107,7 @@ flush table t1;
 lock tables t1 write, t2 read;
 delete from t1 limit 1;
 insert into t1 select * from t2;
-SET SESSION debug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -128,7 +128,7 @@ create table t_corrupted1 (a varchar(100), key(a)) engine=aria;
 insert into t_corrupted1 select (rand()) from t2;
 flush table t_corrupted1;
 * copied t_corrupted1 for comparison
-SET SESSION debug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash_sort_index";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash_sort_index";
 * crashing mysqld intentionally
 optimize table t_corrupted1;
 ERROR HY000: Lost connection to MySQL server during query

--- a/mysql-test/suite/maria/r/maria-recovery3.result
+++ b/mysql-test/suite/maria/r/maria-recovery3.result
@@ -8,11 +8,11 @@ create table t1(a int primary key) engine=aria;
 insert into t1 values(1);
 flush table t1;
 * copied t1 for comparison
-set session debug="+d,maria_sleep_in_commit";
+set session debug_dbug="+d,maria_sleep_in_commit";
 insert into t1 values(2);
 set global aria_checkpoint_interval=1000;
 delete from t1 where a=2;
-SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -48,7 +48,7 @@ mysqltest.t1	check	status	OK
 flush table t1;
 * copied t1 for comparison
 * compared t1 to old version
-SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query
@@ -71,7 +71,7 @@ truncate table t1;
 flush table t1;
 * copied t1 for comparison
 truncate table t1;
-SET SESSION debug="+d,maria_flush_whole_log,maria_crash_create_table";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash_create_table";
 * crashing mysqld intentionally
 truncate table t1;
 ERROR HY000: Lost connection to MySQL server during query

--- a/mysql-test/suite/maria/t/maria-recovery-bitmap.test
+++ b/mysql-test/suite/maria/t/maria-recovery-bitmap.test
@@ -48,7 +48,7 @@ delete from t1 limit 1;
 # --send on the connection during aria_verify_recovery.inc, which makes that
 # script fail if it were to try to use that connection before --reap.
 connect (extra, localhost, root,,mysqltest,,);
-set session debug="+d,info,enter,exit,maria_over_alloc_bitmap";
+set session debug_dbug="+d,info,enter,exit,maria_over_alloc_bitmap";
 send insert into t1 values ("aaaaaaaaa");
 connection admin;
 # Leave time for INSERT to block after modifying bitmap;

--- a/mysql-test/suite/maria/t/maria-recovery2.test
+++ b/mysql-test/suite/maria/t/maria-recovery2.test
@@ -62,7 +62,7 @@ drop table t1;
 # A basic checkpoint test
 --echo * TEST of checkpoint
 # Don't take a full checkpoints, we want to test checkpoint vs dirty pages
-set global debug="+d,info,query,enter,exit,loop,maria_checkpoint_indirect";
+set global debug_dbug="+d,info,query,enter,exit,loop,maria_checkpoint_indirect";
 # restart checkpoint thread for it to notice the above
 set global aria_checkpoint_interval=10000;
 create table t1(a int, b varchar(10), index(a,b)) engine=aria;

--- a/mysql-test/suite/maria/t/maria-recovery3.test
+++ b/mysql-test/suite/maria/t/maria-recovery3.test
@@ -42,7 +42,7 @@ let $mms_compare_physically=0;
 create table t1(a int primary key) engine=aria;
 insert into t1 values(1);
 -- source include/maria_make_snapshot_for_comparison.inc
-set session debug="+d,maria_sleep_in_commit";
+set session debug_dbug="+d,maria_sleep_in_commit";
 send insert into t1 values(2);
 sleep 1;
 # Now the INSERT of 2 has written a commit record

--- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug36981.result
+++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug36981.result
-set session debug="+d,optimizer_innodb_icp";
+set session debug_dbug="+d,optimizer_innodb_icp";
 create table `t1` (`c1` char(1) default null,`c2` char(10) default null,
 key (`c1`))
 engine=innodb default charset=latin1;

--- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug40992.result
+++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug40992.result
 #
 # Bug#40992 - InnoDB: Crash when engine_condition_pushdown is on
 #
-set session debug="+d,optimizer_innodb_icp";
+set session debug_dbug="+d,optimizer_innodb_icp";
 CREATE TABLE t (
 dummy INT PRIMARY KEY, 
 a INT UNIQUE, 

--- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41029.result
+++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41029.result
@@ -2,7 +2,7 @@ select @default_binlog_format:=@@global.binlog_format;
 @default_binlog_format:=@@global.binlog_format
 STATEMENT
 set global binlog_format=row;
-set session debug="+d,optimizer_innodb_ds_mrr";
+set session debug_dbug="+d,optimizer_innodb_ds_mrr";
 set autocommit=0;
 use test;
 drop table if exists t1;

--- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996.result
+++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996.result
-set session debug="+d,optimizer_innodb_icp";
+set session debug_dbug="+d,optimizer_innodb_icp";
 drop table if exists `t1`;
 Warnings:
 Note	1051	Unknown table 't1'

--- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug42991.result
+++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug42991.result
-set session debug="+d,optimizer_innodb_icp";
+set session debug_dbug="+d,optimizer_innodb_icp";
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;

--- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43249.result
+++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43249.result
-set session debug="+d,optimizer_innodb_icp";
+set session debug_dbug="+d,optimizer_innodb_icp";
 CREATE TABLE t1(c1 TIME NOT NULL, c2 TIME NULL, c3 DATE, PRIMARY
 KEY(c1), UNIQUE INDEX(c2)) engine=innodb;
 INSERT INTO t1 VALUES('8:29:45',NULL,'2009-02-01');

--- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43360.result
+++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43360.result
 #
 # Bug#43360 - Server crash with a simple multi-table update
 #
-set session debug="+d,optimizer_innodb_icp";
+set session debug_dbug="+d,optimizer_innodb_icp";
 CREATE TABLE t1 (
 a CHAR(2) NOT NULL PRIMARY KEY, 
 b VARCHAR(20) NOT NULL,

--- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43448.result
+++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43448.result
 #
 # Bug#43448 - Server crashes on multi table delete with Innodb
 #
-set session debug="+d,optimizer_innodb_icp";
+set session debug_dbug="+d,optimizer_innodb_icp";
 CREATE TABLE t1 (
 id1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY, 
 t CHAR(12)

--- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result
+++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result
 set storage_engine=innodb;
 set @save_time_zone= @@time_zone;
 set time_zone='+03:00';
-set session debug="+d,optimizer_innodb_icp";
+set session debug_dbug="+d,optimizer_innodb_icp";
 CREATE TABLE t1(c1 TIMESTAMP NOT NULL, c2 TIMESTAMP NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1), UNIQUE INDEX(c2));
 INSERT INTO t1 VALUES('98-12-31 11:30:45','98.12.31 11+30+45','98-12-31 11:30:45','98.12.31 11+30+45'),('98/12/30 11*30*45','98@12@30 11^30^45','98/12/30 11*30*45','98@12@30 11^30^45'),('98-12-29','98.12.29','98-12-29','98.12.29'),('98/12/28','98@12@28','98/12/28','98@12@28');
 Warnings:

--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug36981.test
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug36981.test
@@ -4,7 +4,7 @@
 --source include/have_innodb.inc
 # crash requires this
-set session debug="+d,optimizer_innodb_icp";
+set session debug_dbug="+d,optimizer_innodb_icp";
 create table `t1` (`c1` char(1) default null,`c2` char(10) default null,
 key (`c1`))

--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug40992.test
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug40992.test
@@ -6,7 +6,7 @@
 --source include/have_innodb.inc
 # Crash requires that we enable Index Condition Pushdown in InnoDB
-set session debug="+d,optimizer_innodb_icp";
+set session debug_dbug="+d,optimizer_innodb_icp";
 CREATE TABLE t (
  dummy INT PRIMARY KEY, 

--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug41029.test
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug41029.test
@@ -13,7 +13,7 @@ connect (con2,localhost,root,,);
 connection con1;
 # bug requires this
-set session debug="+d,optimizer_innodb_ds_mrr";
+set session debug_dbug="+d,optimizer_innodb_ds_mrr";
 set autocommit=0;
 use test;

--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug41996.test
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug41996.test
@@ -5,7 +5,7 @@
 --source include/have_innodb.inc
 # crash requires this
-set session debug="+d,optimizer_innodb_icp";
+set session debug_dbug="+d,optimizer_innodb_icp";
 drop table if exists `t1`;
 create table `t1` (`c` bigint, key(`c`),`a` int)engine=innodb;

--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test
@@ -7,7 +7,7 @@
 --source include/have_innodb.inc
 # Valgrind errors happen only with this:
-set session debug="+d,optimizer_innodb_icp";
+set session debug_dbug="+d,optimizer_innodb_icp";
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43101.test
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43101.test
@@ -4,7 +4,7 @@
 --source include/have_debug.inc
 # Goes away with
-#set session debug=+d,optimizer_no_icp;
+#set session debug_dbug=+d,optimizer_no_icp;
 CREATE TABLE t1(c1 TIME NOT NULL, c2 TIME NULL, c3 DATE, PRIMARY
 KEY(c1), UNIQUE INDEX(c2));

--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43249.test
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43249.test
@@ -4,7 +4,7 @@
 --source include/have_debug.inc
 --source include/have_innodb.inc
-set session debug="+d,optimizer_innodb_icp";
+set session debug_dbug="+d,optimizer_innodb_icp";
 CREATE TABLE t1(c1 TIME NOT NULL, c2 TIME NULL, c3 DATE, PRIMARY
 KEY(c1), UNIQUE INDEX(c2)) engine=innodb;

--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43360.test
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43360.test
@@ -7,7 +7,7 @@
 --source include/have_innodb.inc
 # crash requires this
-set session debug="+d,optimizer_innodb_icp";
+set session debug_dbug="+d,optimizer_innodb_icp";
 CREATE TABLE t1 (
  a CHAR(2) NOT NULL PRIMARY KEY, 

--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43448.test
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43448.test
@@ -6,7 +6,7 @@
 --source include/have_innodb.inc
 # crash requires ICP support in InnoDB
-set session debug="+d,optimizer_innodb_icp";
+set session debug_dbug="+d,optimizer_innodb_icp";
 CREATE TABLE t1 (
  id1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY, 

--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test
@@ -6,7 +6,7 @@
 set storage_engine=innodb;
 set @save_time_zone= @@time_zone;
 set time_zone='+03:00';
-set session debug="+d,optimizer_innodb_icp";
+set session debug_dbug="+d,optimizer_innodb_icp";
 ######## Running INSERT tests for TIMESTAMP ########

--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43618.test
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43618.test
@@ -6,7 +6,7 @@
 set @save_time_zone= @@time_zone;
 set time_zone='+03:00';
 # bug goes away with
-#set session debug="+d,optimizer_no_icp";
+#set session debug_dbug="+d,optimizer_no_icp";
 ######## Running INSERT tests for TIMESTAMP ########

--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug45221.test
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug45221.test
@@ -4,7 +4,7 @@
 --source include/have_debug.inc
 # bug goes away with
-#set session debug="+d,optimizer_no_icp";
+#set session debug_dbug="+d,optimizer_no_icp";
 # those don't remove the problem but make the result diff different:
 #set optimizer_switch="materialization=off";

--- a/mysql-test/suite/parts/inc/partition_crash_add.inc
+++ b/mysql-test/suite/parts/inc/partition_crash_add.inc
 # To be used with partition mgm commands like
 # ALTER TABLE t1 ADD PARTITION (LIST/RANGE PARTITIONING).
 --echo # Crash testing ADD PARTITION
-SET SESSION debug="+d,crash_add_partition_1";
+SET SESSION debug_dbug="+d,crash_add_partition_1";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_add_partition_1";
+SET SESSION debug_dbug="-d,crash_add_partition_1";
-SET SESSION debug="+d,crash_add_partition_2";
+SET SESSION debug_dbug="+d,crash_add_partition_2";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_add_partition_2";
+SET SESSION debug_dbug="-d,crash_add_partition_2";
-SET SESSION debug="+d,crash_add_partition_3";
+SET SESSION debug_dbug="+d,crash_add_partition_3";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_add_partition_3";
+SET SESSION debug_dbug="-d,crash_add_partition_3";
-SET SESSION debug="+d,crash_add_partition_4";
+SET SESSION debug_dbug="+d,crash_add_partition_4";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_add_partition_4";
+SET SESSION debug_dbug="-d,crash_add_partition_4";
-SET SESSION debug="+d,crash_add_partition_5";
+SET SESSION debug_dbug="+d,crash_add_partition_5";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_add_partition_5";
+SET SESSION debug_dbug="-d,crash_add_partition_5";
-SET SESSION debug="+d,crash_add_partition_6";
+SET SESSION debug_dbug="+d,crash_add_partition_6";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_add_partition_6";
+SET SESSION debug_dbug="-d,crash_add_partition_6";
-SET SESSION debug="+d,crash_add_partition_7";
+SET SESSION debug_dbug="+d,crash_add_partition_7";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_add_partition_7";
+SET SESSION debug_dbug="-d,crash_add_partition_7";
-SET SESSION debug="+d,crash_add_partition_8";
+SET SESSION debug_dbug="+d,crash_add_partition_8";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_add_partition_8";
+SET SESSION debug_dbug="-d,crash_add_partition_8";
-SET SESSION debug="+d,crash_add_partition_9";
+SET SESSION debug_dbug="+d,crash_add_partition_9";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_add_partition_9";
+SET SESSION debug_dbug="-d,crash_add_partition_9";
-SET SESSION debug="+d,crash_add_partition_10";
+SET SESSION debug_dbug="+d,crash_add_partition_10";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_add_partition_10";
+SET SESSION debug_dbug="-d,crash_add_partition_10";
--- a/mysql-test/suite/parts/inc/partition_crash_change.inc
+++ b/mysql-test/suite/parts/inc/partition_crash_change.inc
@@ -2,39 +2,39 @@
 # ALTER TABLE t1 COALESCE/REBUILD/REORGANIZE PARTITION.
 --echo # Test change partition (REORGANIZE/REBUILD/COALESCE
 --echo # or ADD HASH PARTITION).
-SET SESSION debug="+d,crash_change_partition_1";
+SET SESSION debug_dbug="+d,crash_change_partition_1";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_change_partition_1";
+SET SESSION debug_dbug="-d,crash_change_partition_1";
-SET SESSION debug="+d,crash_change_partition_2";
+SET SESSION debug_dbug="+d,crash_change_partition_2";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_change_partition_2";
+SET SESSION debug_dbug="-d,crash_change_partition_2";
-SET SESSION debug="+d,crash_change_partition_3";
+SET SESSION debug_dbug="+d,crash_change_partition_3";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_change_partition_3";
+SET SESSION debug_dbug="-d,crash_change_partition_3";
-SET SESSION debug="+d,crash_change_partition_4";
+SET SESSION debug_dbug="+d,crash_change_partition_4";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_change_partition_4";
+SET SESSION debug_dbug="-d,crash_change_partition_4";
-SET SESSION debug="+d,crash_change_partition_5";
+SET SESSION debug_dbug="+d,crash_change_partition_5";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_change_partition_5";
+SET SESSION debug_dbug="-d,crash_change_partition_5";
-SET SESSION debug="+d,crash_change_partition_6";
+SET SESSION debug_dbug="+d,crash_change_partition_6";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_change_partition_6";
+SET SESSION debug_dbug="-d,crash_change_partition_6";
-SET SESSION debug="+d,crash_change_partition_7";
+SET SESSION debug_dbug="+d,crash_change_partition_7";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_change_partition_7";
+SET SESSION debug_dbug="-d,crash_change_partition_7";
-SET SESSION debug="+d,crash_change_partition_8";
+SET SESSION debug_dbug="+d,crash_change_partition_8";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_change_partition_8";
+SET SESSION debug_dbug="-d,crash_change_partition_8";
-SET SESSION debug="+d,crash_change_partition_9";
+SET SESSION debug_dbug="+d,crash_change_partition_9";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_change_partition_9";
+SET SESSION debug_dbug="-d,crash_change_partition_9";
-SET SESSION debug="+d,crash_change_partition_10";
+SET SESSION debug_dbug="+d,crash_change_partition_10";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_change_partition_10";
+SET SESSION debug_dbug="-d,crash_change_partition_10";
-SET SESSION debug="+d,crash_change_partition_11";
+SET SESSION debug_dbug="+d,crash_change_partition_11";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_change_partition_11";
+SET SESSION debug_dbug="-d,crash_change_partition_11";
-SET SESSION debug="+d,crash_change_partition_12";
+SET SESSION debug_dbug="+d,crash_change_partition_12";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_change_partition_12";
+SET SESSION debug_dbug="-d,crash_change_partition_12";
--- a/mysql-test/suite/parts/inc/partition_crash_drop.inc
+++ b/mysql-test/suite/parts/inc/partition_crash_drop.inc
 # To be used with partition mgm commands like
 # ALTER TABLE t1 DROP PARTITION.
 --echo # Test DROP PARTITION
-SET SESSION debug="+d,crash_drop_partition_1";
+SET SESSION debug_dbug="+d,crash_drop_partition_1";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_drop_partition_1";
+SET SESSION debug_dbug="-d,crash_drop_partition_1";
-SET SESSION debug="+d,crash_drop_partition_2";
+SET SESSION debug_dbug="+d,crash_drop_partition_2";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_drop_partition_2";
+SET SESSION debug_dbug="-d,crash_drop_partition_2";
-SET SESSION debug="+d,crash_drop_partition_3";
+SET SESSION debug_dbug="+d,crash_drop_partition_3";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_drop_partition_3";
+SET SESSION debug_dbug="-d,crash_drop_partition_3";
-SET SESSION debug="+d,crash_drop_partition_4";
+SET SESSION debug_dbug="+d,crash_drop_partition_4";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_drop_partition_4";
+SET SESSION debug_dbug="-d,crash_drop_partition_4";
-SET SESSION debug="+d,crash_drop_partition_5";
+SET SESSION debug_dbug="+d,crash_drop_partition_5";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_drop_partition_5";
+SET SESSION debug_dbug="-d,crash_drop_partition_5";
-SET SESSION debug="+d,crash_drop_partition_6";
+SET SESSION debug_dbug="+d,crash_drop_partition_6";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_drop_partition_6";
+SET SESSION debug_dbug="-d,crash_drop_partition_6";
-SET SESSION debug="+d,crash_drop_partition_7";
+SET SESSION debug_dbug="+d,crash_drop_partition_7";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_drop_partition_7";
+SET SESSION debug_dbug="-d,crash_drop_partition_7";
-SET SESSION debug="+d,crash_drop_partition_8";
+SET SESSION debug_dbug="+d,crash_drop_partition_8";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_drop_partition_8";
+SET SESSION debug_dbug="-d,crash_drop_partition_8";
-SET SESSION debug="+d,crash_drop_partition_9";
+SET SESSION debug_dbug="+d,crash_drop_partition_9";
 --source suite/parts/inc/partition_crash.inc
-SET SESSION debug="-d,crash_drop_partition_9";
+SET SESSION debug_dbug="-d,crash_drop_partition_9";
--- a/mysql-test/suite/parts/inc/partition_fail_add.inc
+++ b/mysql-test/suite/parts/inc/partition_fail_add.inc
 # To be used with partition mgm commands like
 # ALTER TABLE t1 ADD PARTITION (LIST/RANGE PARTITIONING).
 --echo # Error recovery testing ADD PARTITION
-SET SESSION debug="+d,fail_add_partition_1";
+SET SESSION debug_dbug="+d,fail_add_partition_1";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_add_partition_1";
+SET SESSION debug_dbug="-d,fail_add_partition_1";
-SET SESSION debug="+d,fail_add_partition_2";
+SET SESSION debug_dbug="+d,fail_add_partition_2";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_add_partition_2";
+SET SESSION debug_dbug="-d,fail_add_partition_2";
-SET SESSION debug="+d,fail_add_partition_3";
+SET SESSION debug_dbug="+d,fail_add_partition_3";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_add_partition_3";
+SET SESSION debug_dbug="-d,fail_add_partition_3";
-SET SESSION debug="+d,fail_add_partition_4";
+SET SESSION debug_dbug="+d,fail_add_partition_4";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_add_partition_4";
+SET SESSION debug_dbug="-d,fail_add_partition_4";
-SET SESSION debug="+d,fail_add_partition_5";
+SET SESSION debug_dbug="+d,fail_add_partition_5";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_add_partition_5";
+SET SESSION debug_dbug="-d,fail_add_partition_5";
-SET SESSION debug="+d,fail_add_partition_6";
+SET SESSION debug_dbug="+d,fail_add_partition_6";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_add_partition_6";
+SET SESSION debug_dbug="-d,fail_add_partition_6";
-SET SESSION debug="+d,fail_add_partition_7";
+SET SESSION debug_dbug="+d,fail_add_partition_7";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_add_partition_7";
+SET SESSION debug_dbug="-d,fail_add_partition_7";
-SET SESSION debug="+d,fail_add_partition_8";
+SET SESSION debug_dbug="+d,fail_add_partition_8";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_add_partition_8";
+SET SESSION debug_dbug="-d,fail_add_partition_8";
-SET SESSION debug="+d,fail_add_partition_9";
+SET SESSION debug_dbug="+d,fail_add_partition_9";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_add_partition_9";
+SET SESSION debug_dbug="-d,fail_add_partition_9";
-SET SESSION debug="+d,fail_add_partition_10";
+SET SESSION debug_dbug="+d,fail_add_partition_10";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_add_partition_10";
+SET SESSION debug_dbug="-d,fail_add_partition_10";
--- a/mysql-test/suite/parts/inc/partition_fail_change.inc
+++ b/mysql-test/suite/parts/inc/partition_fail_change.inc
@@ -2,39 +2,39 @@
 # ALTER TABLE t1 COALESCE/REBUILD/REORGANIZE PARTITION.
 --echo # Error recovery change partition (REORGANIZE/REBUILD/COALESCE
 --echo # or ADD HASH PARTITION).
-SET SESSION debug="+d,fail_change_partition_1";
+SET SESSION debug_dbug="+d,fail_change_partition_1";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_change_partition_1";
+SET SESSION debug_dbug="-d,fail_change_partition_1";
-SET SESSION debug="+d,fail_change_partition_2";
+SET SESSION debug_dbug="+d,fail_change_partition_2";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_change_partition_2";
+SET SESSION debug_dbug="-d,fail_change_partition_2";
-SET SESSION debug="+d,fail_change_partition_3";
+SET SESSION debug_dbug="+d,fail_change_partition_3";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_change_partition_3";
+SET SESSION debug_dbug="-d,fail_change_partition_3";
-SET SESSION debug="+d,fail_change_partition_4";
+SET SESSION debug_dbug="+d,fail_change_partition_4";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_change_partition_4";
+SET SESSION debug_dbug="-d,fail_change_partition_4";
-SET SESSION debug="+d,fail_change_partition_5";
+SET SESSION debug_dbug="+d,fail_change_partition_5";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_change_partition_5";
+SET SESSION debug_dbug="-d,fail_change_partition_5";
-SET SESSION debug="+d,fail_change_partition_6";
+SET SESSION debug_dbug="+d,fail_change_partition_6";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_change_partition_6";
+SET SESSION debug_dbug="-d,fail_change_partition_6";
-SET SESSION debug="+d,fail_change_partition_7";
+SET SESSION debug_dbug="+d,fail_change_partition_7";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_change_partition_7";
+SET SESSION debug_dbug="-d,fail_change_partition_7";
-SET SESSION debug="+d,fail_change_partition_8";
+SET SESSION debug_dbug="+d,fail_change_partition_8";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_change_partition_8";
+SET SESSION debug_dbug="-d,fail_change_partition_8";
-SET SESSION debug="+d,fail_change_partition_9";
+SET SESSION debug_dbug="+d,fail_change_partition_9";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_change_partition_9";
+SET SESSION debug_dbug="-d,fail_change_partition_9";
-SET SESSION debug="+d,fail_change_partition_10";
+SET SESSION debug_dbug="+d,fail_change_partition_10";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_change_partition_10";
+SET SESSION debug_dbug="-d,fail_change_partition_10";
-SET SESSION debug="+d,fail_change_partition_11";
+SET SESSION debug_dbug="+d,fail_change_partition_11";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_change_partition_11";
+SET SESSION debug_dbug="-d,fail_change_partition_11";
-SET SESSION debug="+d,fail_change_partition_12";
+SET SESSION debug_dbug="+d,fail_change_partition_12";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_change_partition_12";
+SET SESSION debug_dbug="-d,fail_change_partition_12";
--- a/mysql-test/suite/parts/inc/partition_fail_drop.inc
+++ b/mysql-test/suite/parts/inc/partition_fail_drop.inc
 # To be used with partition mgm commands like
 # ALTER TABLE t1 DROP PARTITION.
 --echo # Error recovery DROP PARTITION
-SET SESSION debug="+d,fail_drop_partition_1";
+SET SESSION debug_dbug="+d,fail_drop_partition_1";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_drop_partition_1";
+SET SESSION debug_dbug="-d,fail_drop_partition_1";
-SET SESSION debug="+d,fail_drop_partition_2";
+SET SESSION debug_dbug="+d,fail_drop_partition_2";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_drop_partition_2";
+SET SESSION debug_dbug="-d,fail_drop_partition_2";
-SET SESSION debug="+d,fail_drop_partition_3";
+SET SESSION debug_dbug="+d,fail_drop_partition_3";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_drop_partition_3";
+SET SESSION debug_dbug="-d,fail_drop_partition_3";
-SET SESSION debug="+d,fail_drop_partition_4";
+SET SESSION debug_dbug="+d,fail_drop_partition_4";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_drop_partition_4";
+SET SESSION debug_dbug="-d,fail_drop_partition_4";
-SET SESSION debug="+d,fail_drop_partition_5";
+SET SESSION debug_dbug="+d,fail_drop_partition_5";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_drop_partition_5";
+SET SESSION debug_dbug="-d,fail_drop_partition_5";
-SET SESSION debug="+d,fail_drop_partition_6";
+SET SESSION debug_dbug="+d,fail_drop_partition_6";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_drop_partition_6";
+SET SESSION debug_dbug="-d,fail_drop_partition_6";
-SET SESSION debug="+d,fail_drop_partition_7";
+SET SESSION debug_dbug="+d,fail_drop_partition_7";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_drop_partition_7";
+SET SESSION debug_dbug="-d,fail_drop_partition_7";
-SET SESSION debug="+d,fail_drop_partition_8";
+SET SESSION debug_dbug="+d,fail_drop_partition_8";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_drop_partition_8";
+SET SESSION debug_dbug="-d,fail_drop_partition_8";
-SET SESSION debug="+d,fail_drop_partition_9";
+SET SESSION debug_dbug="+d,fail_drop_partition_9";
 --source suite/parts/inc/partition_fail.inc
-SET SESSION debug="-d,fail_drop_partition_9";
+SET SESSION debug_dbug="-d,fail_drop_partition_9";
--- a/mysql-test/suite/parts/r/partition_debug_innodb.result
+++ b/mysql-test/suite/parts/r/partition_debug_innodb.result
--- a/mysql-test/suite/parts/r/partition_debug_myisam.result
+++ b/mysql-test/suite/parts/r/partition_debug_myisam.result
--- a/mysql-test/suite/pbxt/r/mysqlshow.result
+++ b/mysql-test/suite/pbxt/r/mysqlshow.result
@@ -114,29 +114,29 @@ Database: information_schema
 | USER_PRIVILEGES                       |
 | USER_STATISTICS                       |
 | VIEWS                                 |
-| INNODB_SYS_COLUMNS                    |
+| INNODB_CMPMEM_RESET                   |
+| PBXT_STATISTICS                       |
+| INNODB_CMPMEM                         |
 | INNODB_RSEG                           |
-| INNODB_CMP                            |
-| INNODB_TRX                            |
 | INNODB_SYS_TABLESTATS                 |
 | INNODB_LOCK_WAITS                     |
-| INNODB_BUFFER_POOL_PAGES_INDEX        |
+| INNODB_INDEX_STATS                    |
-| INNODB_LOCKS                          |
+| INNODB_CMP                            |
 | INNODB_SYS_FOREIGN_COLS               |
 | INNODB_CMP_RESET                      |
 | INNODB_BUFFER_POOL_PAGES              |
-| INNODB_SYS_TABLES                     |
+| INNODB_TRX                            |
-| PBXT_STATISTICS                       |
+| INNODB_BUFFER_POOL_PAGES_INDEX        |
-| INNODB_CMPMEM                         |
+| INNODB_LOCKS                          |
 | INNODB_BUFFER_POOL_PAGES_BLOB         |
-| INNODB_CMPMEM_RESET                   |
+| INNODB_SYS_TABLES                     |
 | INNODB_SYS_FIELDS                     |
-| INNODB_TABLE_STATS                    |
+| INNODB_SYS_COLUMNS                    |
+| INNODB_SYS_STATS                      |
 | INNODB_SYS_FOREIGN                    |
 | INNODB_SYS_INDEXES                    |
-| INNODB_INDEX_STATS                    |
 | XTRADB_ADMIN_COMMAND                  |
-| INNODB_SYS_STATS                      |
+| INNODB_TABLE_STATS                    |
 +---------------------------------------+
 Database: INFORMATION_SCHEMA
 +---------------------------------------+
@@ -177,29 +177,29 @@ Database: INFORMATION_SCHEMA
 | USER_PRIVILEGES                       |
 | USER_STATISTICS                       |
 | VIEWS                                 |
-| INNODB_SYS_COLUMNS                    |
+| INNODB_CMPMEM_RESET                   |
+| PBXT_STATISTICS                       |
+| INNODB_CMPMEM                         |
 | INNODB_RSEG                           |
-| INNODB_CMP                            |
-| INNODB_TRX                            |
 | INNODB_SYS_TABLESTATS                 |
 | INNODB_LOCK_WAITS                     |
-| INNODB_BUFFER_POOL_PAGES_INDEX        |
+| INNODB_INDEX_STATS                    |
-| INNODB_LOCKS                          |
+| INNODB_CMP                            |
 | INNODB_SYS_FOREIGN_COLS               |
 | INNODB_CMP_RESET                      |
 | INNODB_BUFFER_POOL_PAGES              |
-| INNODB_SYS_TABLES                     |
+| INNODB_TRX                            |
-| PBXT_STATISTICS                       |
+| INNODB_BUFFER_POOL_PAGES_INDEX        |
-| INNODB_CMPMEM                         |
+| INNODB_LOCKS                          |
 | INNODB_BUFFER_POOL_PAGES_BLOB         |
-| INNODB_CMPMEM_RESET                   |
+| INNODB_SYS_TABLES                     |
 | INNODB_SYS_FIELDS                     |
-| INNODB_TABLE_STATS                    |
+| INNODB_SYS_COLUMNS                    |
+| INNODB_SYS_STATS                      |
 | INNODB_SYS_FOREIGN                    |
 | INNODB_SYS_INDEXES                    |
-| INNODB_INDEX_STATS                    |
 | XTRADB_ADMIN_COMMAND                  |
-| INNODB_SYS_STATS                      |
+| INNODB_TABLE_STATS                    |
 +---------------------------------------+
 Wildcard: inf_rmation_schema
 +--------------------+

--- a/mysql-test/suite/rpl/r/rpl_binlog_errors.result
+++ b/mysql-test/suite/rpl/r/rpl_binlog_errors.result
@@ -20,7 +20,7 @@ master-bin.000001	#
 master-bin.000002	#
 ###################### TEST #2
 RESET MASTER;
-SET GLOBAL debug="+d,error_unique_log_filename";
+SET GLOBAL debug_dbug="+d,error_unique_log_filename";
 FLUSH LOGS;
 ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
@@ -28,7 +28,7 @@ ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
 show binary logs;
 Log_name	File_size
 master-bin.000001	#
-SET GLOBAL debug="";
+SET GLOBAL debug_dbug="";
 RESET MASTER;
 ###################### TEST #3
 CREATE TABLE t1 (a INT);
@@ -42,11 +42,11 @@ show binary logs;
 Log_name	File_size
 master-bin.000001	#
 master-bin.000002	#
-SET GLOBAL debug="-d,error_unique_log_filename";
+SET GLOBAL debug_dbug="-d,error_unique_log_filename";
 DELETE FROM t2;
 RESET MASTER;
 ###################### TEST #4
-SET GLOBAL debug="+d,error_unique_log_filename";
+SET GLOBAL debug_dbug="+d,error_unique_log_filename";
 LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data' INTO TABLE t2;
 ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
@@ -54,21 +54,21 @@ ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
 SELECT count(*) FROM t2;
 count(*)
 1
-SET GLOBAL debug="-d,error_unique_log_filename";
+SET GLOBAL debug_dbug="-d,error_unique_log_filename";
 DELETE FROM t2;
 RESET MASTER;
 ###################### TEST #5
-SET GLOBAL debug="+d,error_unique_log_filename";
+SET GLOBAL debug_dbug="+d,error_unique_log_filename";
 LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166-2.data' INTO TABLE t2;
 # assert: must show one entry
 SELECT count(*) FROM t2;
 count(*)
 1
-SET GLOBAL debug="-d,error_unique_log_filename";
+SET GLOBAL debug_dbug="-d,error_unique_log_filename";
 DELETE FROM t2;
 RESET MASTER;
 ###################### TEST #6
-SET GLOBAL debug="+d,error_unique_log_filename";
+SET GLOBAL debug_dbug="+d,error_unique_log_filename";
 SET AUTOCOMMIT=0;
 INSERT INTO t2 VALUES ('muse');
 LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data' INTO TABLE t2;
@@ -81,11 +81,11 @@ SELECT count(*) FROM t2;
 count(*)
 3
 SET AUTOCOMMIT= 1;
-SET GLOBAL debug="-d,error_unique_log_filename";
+SET GLOBAL debug_dbug="-d,error_unique_log_filename";
 DELETE FROM t2;
 RESET MASTER;
 ###################### TEST #7
-SET GLOBAL debug="+d,error_unique_log_filename";
+SET GLOBAL debug_dbug="+d,error_unique_log_filename";
 SELECT count(*) FROM t4;
 count(*)
 0
@@ -97,14 +97,14 @@ SELECT count(*) FROM t4;
 count(*)
 1
 ### check that the incident event is written to the current log
-SET GLOBAL debug="-d,error_unique_log_filename";
+SET GLOBAL debug_dbug="-d,error_unique_log_filename";
 show binlog events from <binlog_start> limit 4,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Incident	#	#	#1 (LOST_EVENTS)
 DELETE FROM t4;
 RESET MASTER;
 ###################### TEST #8
-SET GLOBAL debug="+d,error_unique_log_filename";
+SET GLOBAL debug_dbug="+d,error_unique_log_filename";
 # must show 0 entries
 SELECT count(*) FROM t4;
 count(*)
@@ -144,9 +144,9 @@ count(*)
 SELECT count(*) FROM t2;
 count(*)
 0
-SET GLOBAL debug="-d,error_unique_log_filename";
+SET GLOBAL debug_dbug="-d,error_unique_log_filename";
 ###################### TEST #9
-SET GLOBAL debug="+d,error_unique_log_filename";
+SET GLOBAL debug_dbug="+d,error_unique_log_filename";
 SET SQL_LOG_BIN=0;
 INSERT INTO t2 VALUES ('aaa'), ('bbb'), ('ccc'), ('ddd');
 INSERT INTO t4 VALUES ('eee'), ('fff'), ('ggg'), ('hhh');
@@ -167,17 +167,17 @@ SELECT count(*) FROM t4;
 count(*)
 0
 SET SQL_LOG_BIN=1;
-SET GLOBAL debug="-d,error_unique_log_filename";
+SET GLOBAL debug_dbug="-d,error_unique_log_filename";
 ###################### TEST #10
 call mtr.add_suppression("MSYQL_BIN_LOG::open failed to sync the index file.");
 call mtr.add_suppression("Could not open .*");
 RESET MASTER;
 SHOW WARNINGS;
 Level	Code	Message
-SET GLOBAL debug="+d,fault_injection_registering_index";
+SET GLOBAL debug_dbug="+d,fault_injection_registering_index";
 FLUSH LOGS;
 ERROR HY000: Can't open file: 'master-bin.000002' (errno: 1)
-SET GLOBAL debug="-d,fault_injection_registering_index";
+SET GLOBAL debug_dbug="-d,fault_injection_registering_index";
 SHOW BINARY LOGS;
 ERROR HY000: You are not using binary logging
 CREATE TABLE t5 (a INT);
@@ -188,10 +188,10 @@ DELETE FROM t2;
 DROP TABLE t5;
 ###################### TEST #11
 include/rpl_restart_server.inc [server_number=1]
-SET GLOBAL debug="+d,fault_injection_openning_index";
+SET GLOBAL debug_dbug="+d,fault_injection_openning_index";
 FLUSH LOGS;
 ERROR HY000: Can't open file: 'master-bin.index' (errno: 1)
-SET GLOBAL debug="-d,fault_injection_openning_index";
+SET GLOBAL debug_dbug="-d,fault_injection_openning_index";
 RESET MASTER;
 ERROR HY000: Binlog closed, cannot RESET MASTER
 CREATE TABLE t5 (a INT);
@@ -202,10 +202,10 @@ DELETE FROM t2;
 DROP TABLE t5;
 include/rpl_restart_server.inc [server_number=1]
 ###################### TEST #12
-SET GLOBAL debug="+d,fault_injection_new_file_rotate_event";
+SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event";
 FLUSH LOGS;
 ERROR HY000: Can't open file: 'master-bin' (errno: 2)
-SET GLOBAL debug="-d,fault_injection_new_file_rotate_event";
+SET GLOBAL debug_dbug="-d,fault_injection_new_file_rotate_event";
 RESET MASTER;
 ERROR HY000: Binlog closed, cannot RESET MASTER
 CREATE TABLE t5 (a INT);
@@ -215,7 +215,7 @@ DELETE FROM t4;
 DELETE FROM t2;
 DROP TABLE t5;
 include/rpl_restart_server.inc [server_number=1]
-SET GLOBAL debug= @old_debug;
+SET GLOBAL debug_dbug= @old_debug;
 DROP TABLE t1, t2, t4;
 RESET MASTER;
 include/start_slave.inc
@@ -231,47 +231,47 @@ call mtr.add_suppression("Can't generate a unique log-filename .*");
 ###################### TEST #13
 SET @old_debug=@@global.debug;
 include/stop_slave.inc
-SET GLOBAL debug="+d,error_unique_log_filename";
+SET GLOBAL debug_dbug="+d,error_unique_log_filename";
 START SLAVE io_thread;
 include/wait_for_slave_io_error.inc [errno=1595]
 Last_IO_Error = 'Relay log write failure: could not queue event from master'
-SET GLOBAL debug="-d,error_unique_log_filename";
+SET GLOBAL debug_dbug="-d,error_unique_log_filename";
-SET GLOBAL debug=@old_debug;
+SET GLOBAL debug_dbug=@old_debug;
 include/rpl_restart_server.inc [server_number=2]
 ###################### TEST #14
 SET @old_debug=@@global.debug;
 include/stop_slave.inc
-SET GLOBAL debug="+d,fault_injection_new_file_rotate_event";
+SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event";
 START SLAVE io_thread;
 include/wait_for_slave_io_error.inc [errno=1595]
 Last_IO_Error = 'Relay log write failure: could not queue event from master'
-SET GLOBAL debug="-d,fault_injection_new_file_rotate_event";
+SET GLOBAL debug_dbug="-d,fault_injection_new_file_rotate_event";
-SET GLOBAL debug=@old_debug;
+SET GLOBAL debug_dbug=@old_debug;
 include/rpl_restart_server.inc [server_number=2]
 ###################### TEST #15
 SET @old_debug=@@global.debug;
 include/stop_slave.inc
-SET GLOBAL debug="+d,fault_injection_registering_index";
+SET GLOBAL debug_dbug="+d,fault_injection_registering_index";
 START SLAVE io_thread;
 include/wait_for_slave_io_error.inc [errno=1595]
 Last_IO_Error = 'Relay log write failure: could not queue event from master'
-SET GLOBAL debug="-d,fault_injection_registering_index";
+SET GLOBAL debug_dbug="-d,fault_injection_registering_index";
-SET GLOBAL debug=@old_debug;
+SET GLOBAL debug_dbug=@old_debug;
 include/rpl_restart_server.inc [server_number=2]
 ###################### TEST #16
 SET @old_debug=@@global.debug;
 include/stop_slave.inc
-SET GLOBAL debug="+d,fault_injection_openning_index";
+SET GLOBAL debug_dbug="+d,fault_injection_openning_index";
 START SLAVE io_thread;
 include/wait_for_slave_io_error.inc [errno=1595]
 Last_IO_Error = 'Relay log write failure: could not queue event from master'
-SET GLOBAL debug="-d,fault_injection_openning_index";
+SET GLOBAL debug_dbug="-d,fault_injection_openning_index";
-SET GLOBAL debug=@old_debug;
+SET GLOBAL debug_dbug=@old_debug;
 include/rpl_restart_server.inc [server_number=2]
 include/stop_slave_sql.inc
 Warnings:
 Note	1255	Slave already has been stopped
-SET GLOBAL debug=@old_debug;
+SET GLOBAL debug_dbug=@old_debug;
 RESET SLAVE;
 RESET MASTER;
 include/rpl_end.inc
--- a/mysql-test/suite/rpl/r/rpl_bug26395.result
+++ b/mysql-test/suite/rpl/r/rpl_bug26395.result
@@ -9,7 +9,7 @@ tinnodb	CREATE TABLE `tinnodb` (
  `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 set @old_debug= @@debug;
-set @@debug= 'd,do_not_write_xid';
+set @@debug_dbug= 'd,do_not_write_xid';
 ==== Test ====
 INSERT INTO tinnodb VALUES (1);
 SELECT * FROM tinnodb ORDER BY a;
@@ -33,7 +33,7 @@ a
 ==== Clean up ====
 [on master]
 DROP TABLE tinnodb;
-set @@debug= @old_debug;
+set @@debug_dbug= @old_debug;
 [on slave]
 DROP TABLE tinnodb;
 include/rpl_end.inc
--- a/mysql-test/suite/rpl/r/rpl_bug33931.result
+++ b/mysql-test/suite/rpl/r/rpl_bug33931.result
@@ -4,10 +4,10 @@ call mtr.add_suppression("Failed during slave I/O thread initialization");
 call mtr.add_suppression("Slave SQL.*Failed during slave thread initialization.* 1593");
 include/stop_slave.inc
 reset slave;
-SET GLOBAL debug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";
+SET GLOBAL debug_dbug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";
 start slave;
 include/wait_for_slave_sql_error.inc [errno=1593]
 Last_SQL_Error = 'Failed during slave thread initialization'
-SET GLOBAL debug="";
+SET GLOBAL debug_dbug="";
 RESET SLAVE;
 include/rpl_end.inc
--- a/mysql-test/suite/rpl/r/rpl_bug41902.result
+++ b/mysql-test/suite/rpl/r/rpl_bug41902.result
 include/master-slave.inc
 [connection master]
 stop slave;
-SET @@debug="d,simulate_find_log_pos_error";
+SET @@debug_dbug="d,simulate_find_log_pos_error";
 reset slave;
 ERROR HY000: Target log not found in binlog index
 show warnings;
 Level	Code	Message
 Error	1373	Target log not found in binlog index
 Error	1371	Failed purging old relay logs: Failed during log reset
-SET @@debug="";
+SET @@debug_dbug="";
 reset slave;
 change master to master_host='dummy';
-SET @@debug="d,simulate_find_log_pos_error";
+SET @@debug_dbug="d,simulate_find_log_pos_error";
 change master to master_host='dummy';
 ERROR HY000: Target log not found in binlog index
-SET @@debug="";
+SET @@debug_dbug="";
 reset slave;
 change master to master_host='dummy';
-SET @@debug="d,simulate_find_log_pos_error";
+SET @@debug_dbug="d,simulate_find_log_pos_error";
 reset master;
 ERROR HY000: Target log not found in binlog index
-SET @@debug="";
+SET @@debug_dbug="";
 reset master;
-SET @@debug="d,simulate_find_log_pos_error";
+SET @@debug_dbug="d,simulate_find_log_pos_error";
 purge binary logs to 'master-bin.000001';
 ERROR HY000: Target log not found in binlog index
-SET @@debug="";
+SET @@debug_dbug="";
 purge binary logs to 'master-bin.000001';
 ==== clean up ====
 CHANGE MASTER TO MASTER_HOST = '127.0.0.1';

--- a/mysql-test/suite/rpl/r/rpl_checksum.result
+++ b/mysql-test/suite/rpl/r/rpl_checksum.result
@@ -68,36 +68,36 @@ zero
 include/stop_slave.inc
 set @@global.binlog_checksum = CRC32;
 insert into t1 values (1) /* will not be applied on slave due to simulation */;
-set @@global.debug='d,simulate_slave_unaware_checksum';
+set @@global.debug_dbug='d,simulate_slave_unaware_checksum';
 start slave;
 include/wait_for_slave_io_error.inc [errno=1236]
 Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'Slave can not handle replication events with the checksum that master is configured to log; the last event was read from 'master-bin.000010' at 245, the last byte read was read from 'master-bin.000010' at 245.''
 select count(*) as zero from t1;
 zero
 0
-set @@global.debug='';
+set @@global.debug_dbug='';
 include/start_slave.inc
 set @@global.master_verify_checksum = 1;
-set @@session.debug='d,simulate_checksum_test_failure';
+set @@session.debug_dbug='d,simulate_checksum_test_failure';
 show binlog events;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error
-set @@session.debug='';
+set @@session.debug_dbug='';
 set @@global.master_verify_checksum = default;
 include/stop_slave.inc
 create table t2 (a int);
-set @@global.debug='d,simulate_checksum_test_failure';
+set @@global.debug_dbug='d,simulate_checksum_test_failure';
 start slave io_thread;
 include/wait_for_slave_io_error.inc [errno=1595]
 Last_IO_Error = 'Relay log write failure: could not queue event from master'
-set @@global.debug='';
+set @@global.debug_dbug='';
 start slave io_thread;
 include/wait_for_slave_param.inc [Read_Master_Log_Pos]
 set @@global.slave_sql_verify_checksum = 1;
-set @@global.debug='d,simulate_checksum_test_failure';
+set @@global.debug_dbug='d,simulate_checksum_test_failure';
 start slave sql_thread;
 include/wait_for_slave_sql_error.inc [errno=1593]
 Last_SQL_Error = 'Error initializing relay log position: I/O error reading event at position 4'
-set @@global.debug='';
+set @@global.debug_dbug='';
 include/start_slave.inc
 select count(*) as 'must be zero' from t2;
 must be zero

--- a/mysql-test/suite/rpl/r/rpl_corruption.result
+++ b/mysql-test/suite/rpl/r/rpl_corruption.result
@@ -12,40 +12,40 @@ SET @old_master_verify_checksum = @@master_verify_checksum;
 CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(10), c VARCHAR(100));
 include/stop_slave.inc
 # 2. Corruption in master binlog and SHOW BINLOG EVENTS
-SET GLOBAL debug="+d,corrupt_read_log_event_char";
+SET GLOBAL debug_dbug="+d,corrupt_read_log_event_char";
 SHOW BINLOG EVENTS;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error
-SET GLOBAL debug="-d,corrupt_read_log_event_char";
+SET GLOBAL debug_dbug="-d,corrupt_read_log_event_char";
 # 3. Master read a corrupted event from binlog and send the error to slave
-SET GLOBAL debug="+d,corrupt_read_log_event2";
+SET GLOBAL debug_dbug="+d,corrupt_read_log_event2";
 START SLAVE IO_THREAD;
 include/wait_for_slave_io_error.inc [errno=1236]
-SET GLOBAL debug="-d,corrupt_read_log_event2";
+SET GLOBAL debug_dbug="-d,corrupt_read_log_event2";
 # 4. Master read a corrupted event from binlog and send it to slave
 SET GLOBAL master_verify_checksum=0;
-SET GLOBAL debug="+d,corrupt_read_log_event2";
+SET GLOBAL debug_dbug="+d,corrupt_read_log_event2";
 START SLAVE IO_THREAD;
 include/wait_for_slave_io_error.inc [errno=1595,1722]
-SET GLOBAL debug="-d,corrupt_read_log_event2";
+SET GLOBAL debug_dbug="-d,corrupt_read_log_event2";
-SET GLOBAL debug= "";
+SET GLOBAL debug_dbug= "";
 SET GLOBAL master_verify_checksum=1;
 # 5. Slave. Corruption in network
-SET GLOBAL debug="+d,corrupt_queue_event";
+SET GLOBAL debug_dbug="+d,corrupt_queue_event";
 START SLAVE IO_THREAD;
 include/wait_for_slave_io_error.inc [errno=1595,1722]
-SET GLOBAL debug="-d,corrupt_queue_event";
+SET GLOBAL debug_dbug="-d,corrupt_queue_event";
 # 6. Slave. Corruption in relay log
-SET GLOBAL debug="+d,corrupt_read_log_event_char";
+SET GLOBAL debug_dbug="+d,corrupt_read_log_event_char";
 START SLAVE SQL_THREAD;
 include/wait_for_slave_sql_error.inc [errno=1593]
-SET GLOBAL debug="-d,corrupt_read_log_event_char";
+SET GLOBAL debug_dbug="-d,corrupt_read_log_event_char";
-SET GLOBAL debug= "";
+SET GLOBAL debug_dbug= "";
 # 7. Seek diff for tables on master and slave
 include/start_slave.inc
 include/diff_tables.inc [master:test.t1, slave:test.t1]
 # 8. Clean up
-SET GLOBAL debug= "";
+SET GLOBAL debug_dbug= "";
 SET GLOBAL master_verify_checksum = @old_master_verify_checksum;
 DROP TABLE t1;
-SET GLOBAL debug= "";
+SET GLOBAL debug_dbug= "";
 include/rpl_end.inc
--- a/mysql-test/suite/rpl/r/rpl_init_slave_errors.result
+++ b/mysql-test/suite/rpl/r/rpl_init_slave_errors.result
@@ -2,12 +2,12 @@ include/master-slave.inc
 [connection master]
 stop slave;
 reset slave;
-SET GLOBAL debug= "d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";
+SET GLOBAL debug_dbug= "d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";
 start slave;
 include/wait_for_slave_sql_error.inc [errno=1593]
 Last_SQL_Error = 'Failed during slave thread initialization'
 call mtr.add_suppression("Failed during slave.* thread initialization");
-SET GLOBAL debug= "";
+SET GLOBAL debug_dbug= "";
 reset slave;
 SET GLOBAL init_slave= "garbage";
 start slave;

--- a/mysql-test/suite/rpl/r/rpl_row_corruption.result
+++ b/mysql-test/suite/rpl/r/rpl_row_corruption.result
@@ -7,17 +7,17 @@ INSERT INTO t2_11753004 VALUES (2);
 call mtr.add_suppression(".*Found table map event mapping table id 0 which was already mapped but with different settings.*");
 include/stop_slave.inc
 SET @save_debug= @@global.debug;
-SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table";
+SET GLOBAL debug_dbug="+d,inject_tblmap_same_id_maps_diff_table";
 include/start_slave.inc
 UPDATE t1_11753004, t2_11753004 SET t1_11753004.c1=3, t2_11753004.c1=4 WHERE t1_11753004.c1=1 OR t2_11753004.c1=2;
 include/wait_for_slave_sql_error.inc [errno=1593 ]
 include/stop_slave.inc
-SET GLOBAL debug="-d,inject_tblmap_same_id_maps_diff_table";
+SET GLOBAL debug_dbug="-d,inject_tblmap_same_id_maps_diff_table";
 include/start_slave.inc
 include/rpl_reset.inc
 DROP TABLE t1_11753004, t2_11753004;
 include/stop_slave.inc
-SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table";
+SET GLOBAL debug_dbug="+d,inject_tblmap_same_id_maps_diff_table";
 include/start_slave.inc
 include/rpl_reset.inc
 CREATE TABLE t1_11753004 (c1 INT);
@@ -33,7 +33,7 @@ BINLOG '
 SOgWTg8BAAAAbgAAAHIAAAAAAAQANS42LjMtbTUtZGVidWctbG9nAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAABI6BZOEzgNAAgAEgAEBAQEEgAAVgAEGggAAAAICAgCAAAAAAVAYI8=
 '/*!*/;
-SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table";
+SET GLOBAL debug_dbug="+d,inject_tblmap_same_id_maps_diff_table";
 BINLOG '
 SOgWThMBAAAAKQAAAAYDAAAAAEIAAAAAAAEABHRlc3QAAnQxAAEDAAE=
 SOgWThMBAAAAKQAAAC8DAAAAAEMAAAAAAAEABHRlc3QAAnQyAAEDAAE=
@@ -42,8 +42,8 @@ SOgWThgBAAAAKAAAAH8DAAAAAEMAAAAAAAEAAf///gEAAAD+BAAAAA==
 '/*!*/;
 ERROR HY000: Fatal error: Found table map event mapping table id 0 which was already mapped but with different settings.
 DROP TABLE t1,t2;
-SET GLOBAL debug="-d,inject_tblmap_same_id_maps_diff_table";
+SET GLOBAL debug_dbug="-d,inject_tblmap_same_id_maps_diff_table";
 DROP TABLE t1_11753004;
 DROP TABLE t2_11753004_ign;
-SET GLOBAL debug= @save_debug;
+SET GLOBAL debug_dbug= @save_debug;
 include/rpl_end.inc
--- a/mysql-test/suite/rpl/r/rpl_row_index_choice.result
+++ b/mysql-test/suite/rpl/r/rpl_row_index_choice.result
@@ -29,10 +29,10 @@ ANALYZE TABLE t2;
 Table	Op	Msg_type	Msg_text
 test.t2	analyze	status	OK
 # Slave will crash if using the wrong or no index
-SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan";
+SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan";
 UPDATE t2 SET d=10042 WHERE d=42;
 DELETE FROM t2 WHERE d=53;
-SET GLOBAL debug="";
+SET GLOBAL debug_dbug="";
 SELECT * FROM t2 WHERE d IN (10042,53);
 a	b	c	d
 4	1	5	10042
@@ -46,10 +46,10 @@ ANALYZE TABLE t2;
 Table	Op	Msg_type	Msg_text
 test.t2	analyze	status	OK
 # Slave will crash if using the wrong or no index
-SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan";
+SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan";
 UPDATE t2 SET d=10042 WHERE d=42;
 DELETE FROM t2 WHERE d=53;
-SET GLOBAL debug="";
+SET GLOBAL debug_dbug="";
 SELECT * FROM t2 WHERE d IN (10042,53);
 a	b	c	d	e
 4	1	5	10042	NULL
@@ -60,10 +60,10 @@ UNIQUE expected_key(d),
 KEY wrong_key6(c)) ENGINE=myisam;
 INSERT INTO t2 SELECT d DIV 10, d MOD 41, d MOD 37, d FROM t1;
 # Slave will crash if using the wrong or no index
-SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan";
+SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan";
 UPDATE t2 SET d=10042 WHERE d=42;
 DELETE FROM t2 WHERE d=53;
-SET GLOBAL debug="";
+SET GLOBAL debug_dbug="";
 SELECT * FROM t2 WHERE d IN (10042,53);
 a	b	c	d
 4	1	5	10042
@@ -74,10 +74,10 @@ KEY wrong_key7(d),
 KEY wrong_key8(c)) ENGINE=myisam;
 INSERT INTO t2 SELECT d DIV 10, d MOD 41, d MOD 37, d FROM t1;
 # Slave will crash if using the wrong or no index
-SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan";
+SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan";
 UPDATE t2 SET d=10042 WHERE d=42;
 DELETE FROM t2 WHERE d=53;
-SET GLOBAL debug="";
+SET GLOBAL debug_dbug="";
 SELECT * FROM t2 WHERE d IN (10042,53);
 a	b	c	d
 4	1	5	10042
@@ -88,10 +88,10 @@ KEY wrong_key10(a),
 PRIMARY KEY expected_key(c,b)) ENGINE=innodb;
 INSERT INTO t2 SELECT d DIV 10, d MOD 41, d MOD 37, d FROM t1;
 # Slave will crash if using the wrong or no index
-SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan,slave_crash_if_index_scan";
+SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan,slave_crash_if_index_scan";
 UPDATE t2 SET d=10042 WHERE d=42;
 DELETE FROM t2 WHERE d=53;
-SET GLOBAL debug="";
+SET GLOBAL debug_dbug="";
 SELECT * FROM t2 WHERE d IN (10042,53);
 a	b	c	d
 4	1	5	10042
@@ -105,10 +105,10 @@ ANALYZE TABLE t2;
 Table	Op	Msg_type	Msg_text
 test.t2	analyze	status	OK
 # Slave will crash if using the wrong or no index
-SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan";
+SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan";
 UPDATE t2 SET d=10042 WHERE d=42;
 DELETE FROM t2 WHERE d=53;
-SET GLOBAL debug="";
+SET GLOBAL debug_dbug="";
 SELECT * FROM t2 WHERE d IN (10042,53);
 a	b	c	d	e
 4	1	5	10042	NULL
@@ -119,10 +119,10 @@ UNIQUE expected_key(e),
 KEY wrong_key14(c,b)) ENGINE=innodb;
 INSERT INTO t2 SELECT d DIV 10, d MOD 41, d MOD 37, d, IF(d<10, d, NULL) FROM t1;
 # Slave will crash if using the wrong or no index
-SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan";
+SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan";
 UPDATE t2 SET d=10042 WHERE d=42;
 DELETE FROM t2 WHERE d=53;
-SET GLOBAL debug="";
+SET GLOBAL debug_dbug="";
 SELECT * FROM t2 WHERE d IN (10042,53);
 a	b	c	d	e
 4	1	5	10042	NULL
@@ -136,5 +136,5 @@ a	d
 4	10042
 DROP TABLE t2;
 DROP TABLE t1;
-SET GLOBAL debug="";
+SET GLOBAL debug_dbug="";
 include/rpl_end.inc
--- a/mysql-test/suite/rpl/r/rpl_show_slave_running.result
+++ b/mysql-test/suite/rpl/r/rpl_show_slave_running.result
@@ -2,7 +2,7 @@ include/master-slave.inc
 [connection master]
 SET DEBUG_SYNC= 'RESET';
 include/stop_slave.inc
-set global debug= 'd,dbug.before_get_running_status_yes';
+set global debug_dbug= 'd,dbug.before_get_running_status_yes';
 Slave_running, Slave_IO_Running, Slave_SQL_Running, must be OFF, NO, NO in three following queries
 SHOW STATUS LIKE 'Slave_running';
 Variable_name	Value
@@ -32,7 +32,7 @@ Variable_name	Value
 Slave_running	ON
 Slave_IO_Running= Yes
 Slave_SQL_Running= Yes
-set global debug= '';
+set global debug_dbug= '';
 SET DEBUG_SYNC= 'RESET';
 End of tests
 include/rpl_end.inc
--- a/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
+++ b/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
 include/master-slave.inc
 [connection master]
-SET @@GLOBAL.DEBUG = '+d,remove_slave_load_file_before_write';
+SET @@global.debug_dbug= '+d,remove_slave_load_file_before_write';
 create table t1(a int not null auto_increment, b int, primary key(a)) engine=innodb;
 start transaction;
 insert into t1(b) values (1);
@@ -17,5 +17,5 @@ call mtr.add_suppression("Slave: Can't get stat of .*");
 call mtr.add_suppression("Slave SQL: Error .Can.t get stat of.* Error_code: 13");
 call mtr.add_suppression("Slave: File.* not found.*");
 call mtr.add_suppression("Slave SQL: Error .File.* not found.* Error_code: 29");
-SET @@GLOBAL.DEBUG = '';
+SET @@global.debug_dbug= '';
 include/rpl_end.inc
--- a/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
+++ b/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
@@ -4,7 +4,7 @@ SET @@session.binlog_direct_non_transactional_updates= FALSE;
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 create table tm (a int auto_increment primary key) engine=myisam;
 create table ti (a int auto_increment primary key) engine=innodb;
-set @@global.debug="+d,stop_slave_middle_group";
+set @@global.debug_dbug="+d,stop_slave_middle_group";
 begin;
 insert into ti set a=null;
 insert into tm set a=null;
@@ -23,12 +23,12 @@ one
 select count(*) as one from ti;
 one
 1
-set @@global.debug="-d";
+set @@global.debug_dbug="-d";
 include/start_slave.inc
 truncate table tm;
 truncate table ti;
-set @@global.debug="+d,stop_slave_middle_group";
+set @@global.debug_dbug="+d,stop_slave_middle_group";
-set @@global.debug="+d,incomplete_group_in_relay_log";
+set @@global.debug_dbug="+d,incomplete_group_in_relay_log";
 begin;
 insert into ti set a=null;
 insert into tm set a=null;
@@ -45,12 +45,12 @@ one
 select count(*) as zero from ti;
 zero
 0
-set @@global.debug="-d";
+set @@global.debug_dbug="-d";
 stop slave;
 truncate table tm;
 include/start_slave.inc
-set @@global.debug="+d,stop_slave_middle_group";
+set @@global.debug_dbug="+d,stop_slave_middle_group";
-set @@global.debug="+d,incomplete_group_in_relay_log";
+set @@global.debug_dbug="+d,incomplete_group_in_relay_log";
 update tm as t1, ti as t2 set t1.a=t1.a * 2, t2.a=t2.a * 2;
 include/wait_for_slave_sql_to_stop.inc
 SELECT "Fatal error: ... Slave SQL Thread stopped with incomplete event group having non-transactional changes. If the group consists solely of row-based events, you can try to restart the slave with --slave-exec-mode=IDEMPOTENT, which ignores duplicate key, key not found, and similar errors (see documentation for details)." AS Last_SQL_Error, @check as `true`;
@@ -62,7 +62,7 @@ two
 select max(a) as one from ti;
 one
 1
-set @@global.debug="-d";
+set @@global.debug_dbug="-d";
 include/rpl_reset.inc
 drop table tm, ti;
 include/rpl_end.inc
--- a/mysql-test/suite/rpl/r/rpl_stop_slave.result
+++ b/mysql-test/suite/rpl/r/rpl_stop_slave.result
@@ -14,7 +14,7 @@ include/stop_slave.inc
 # Suspend the INSERT statement in current transaction on SQL thread.
 # It guarantees that SQL thread is applying the transaction when
 # STOP SLAVE command launchs.
-SET GLOBAL debug= 'd,after_mysql_insert';
+SET GLOBAL debug_dbug= 'd,after_mysql_insert';
 include/start_slave.inc
 # CREATE TEMPORARY TABLE with InnoDB engine
@@ -75,7 +75,7 @@ START SLAVE SQL_THREAD;
 include/wait_for_slave_sql_to_start.inc
 # Test end
-SET GLOBAL debug= '$debug_save';
+SET GLOBAL debug_dbug= '$debug_save';
 include/restart_slave.inc
 call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");
 [connection master]
@@ -96,7 +96,7 @@ CREATE TABLE t1 (c1 INT KEY, c2 INT) ENGINE=InnoDB;
 CREATE TABLE t2 (c1 INT) ENGINE=MyISAM;
 INSERT INTO t1 VALUES(1, 1);
 [connection master]
-SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
+SET GLOBAL debug_dbug= 'd,dump_thread_wait_before_send_xid';
 [connection slave]
 include/restart_slave.inc
 BEGIN;
@@ -121,5 +121,5 @@ include/wait_for_slave_to_stop.inc
 include/start_slave.inc
 [connection master]
 DROP TABLE t1, t2;
-SET GLOBAL debug= $debug_save;
+SET GLOBAL debug_dbug= $debug_save;
 include/rpl_end.inc
--- a/mysql-test/suite/rpl/r/rpl_sync.result
+++ b/mysql-test/suite/rpl/r/rpl_sync.result
@@ -14,7 +14,7 @@ insert into t1(a) values(5);
 insert into t1(a) values(6);
 =====Removing relay log files and crashing/recoverying the slave=======;
 include/stop_slave_io.inc
-SET SESSION debug="d,crash_before_rotate_relaylog";
+SET SESSION debug_dbug="d,crash_before_rotate_relaylog";
 FLUSH LOGS;
 ERROR HY000: Lost connection to MySQL server during query
 include/rpl_reconnect.inc
@@ -27,7 +27,7 @@ FLUSH LOGS;
 insert into t1(a) values(7);
 insert into t1(a) values(8);
 insert into t1(a) values(9);
-SET SESSION debug="d,crash_before_rotate_relaylog";
+SET SESSION debug_dbug="d,crash_before_rotate_relaylog";
 FLUSH LOGS;
 ERROR HY000: Lost connection to MySQL server during query
 include/rpl_reconnect.inc

--- a/mysql-test/suite/rpl/t/rpl_binlog_errors.test
+++ b/mysql-test/suite/rpl/t/rpl_binlog_errors.test
@@ -68,14 +68,14 @@ FLUSH LOGS;
 ###            (should show just one binlog)
 RESET MASTER;
-SET GLOBAL debug="+d,error_unique_log_filename";
+SET GLOBAL debug_dbug="+d,error_unique_log_filename";
 -- error ER_NO_UNIQUE_LOGFILE
 FLUSH LOGS;
 -- echo # assert: must show one binlog
 -- source include/show_binary_logs.inc
 ### ACTION: clean up and move to next test
-SET GLOBAL debug="";
+SET GLOBAL debug_dbug="";
 RESET MASTER;
 -- echo ###################### TEST #3
@@ -100,7 +100,7 @@ RESET MASTER;
 -- source include/show_binary_logs.inc
 # clean up the table and the binlog to be used in next part of test
-SET GLOBAL debug="-d,error_unique_log_filename";
+SET GLOBAL debug_dbug="-d,error_unique_log_filename";
 DELETE FROM t2;
 RESET MASTER;
@@ -111,7 +111,7 @@ RESET MASTER;
 ###            changes performed despite the fact that it reported an
 ###            error.
-SET GLOBAL debug="+d,error_unique_log_filename";
+SET GLOBAL debug_dbug="+d,error_unique_log_filename";
 -- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 -- error ER_NO_UNIQUE_LOGFILE
 -- eval LOAD DATA INFILE '$load_file' INTO TABLE t2
@@ -121,7 +121,7 @@ SET GLOBAL debug="+d,error_unique_log_filename";
 SELECT count(*) FROM t2;
 # clean up the table and the binlog to be used in next part of test
-SET GLOBAL debug="-d,error_unique_log_filename";
+SET GLOBAL debug_dbug="-d,error_unique_log_filename";
 DELETE FROM t2;
 RESET MASTER;
@@ -130,7 +130,7 @@ RESET MASTER;
 ### ASSERTION: load the small file into a transactional table and
 ###            check that it succeeds
-SET GLOBAL debug="+d,error_unique_log_filename";
+SET GLOBAL debug_dbug="+d,error_unique_log_filename";
 -- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 -- eval LOAD DATA INFILE '$load_file2' INTO TABLE t2
@@ -139,7 +139,7 @@ SET GLOBAL debug="+d,error_unique_log_filename";
 SELECT count(*) FROM t2;
 # clean up the table and the binlog to be used in next part of test
-SET GLOBAL debug="-d,error_unique_log_filename";
+SET GLOBAL debug_dbug="-d,error_unique_log_filename";
 DELETE FROM t2;
 RESET MASTER;
@@ -150,7 +150,7 @@ RESET MASTER;
 ###            fails we get the error. Transaction is not rolledback
 ###            because rotation happens after the commit.
-SET GLOBAL debug="+d,error_unique_log_filename";
+SET GLOBAL debug_dbug="+d,error_unique_log_filename";
 SET AUTOCOMMIT=0;
 INSERT INTO t2 VALUES ('muse');
 -- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
@@ -165,7 +165,7 @@ SELECT count(*) FROM t2;
 ### ACTION: clean up and move to the next test 
 SET AUTOCOMMIT= 1;
-SET GLOBAL debug="-d,error_unique_log_filename";
+SET GLOBAL debug_dbug="-d,error_unique_log_filename";
 DELETE FROM t2;
 RESET MASTER;
@@ -175,7 +175,7 @@ RESET MASTER;
 ###            fails then an error is reported and an incident event
 ###            is written to the current binary log.
-SET GLOBAL debug="+d,error_unique_log_filename";
+SET GLOBAL debug_dbug="+d,error_unique_log_filename";
 SELECT count(*) FROM t4;
 -- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 -- error ER_NO_UNIQUE_LOGFILE
@@ -185,7 +185,7 @@ SELECT count(*) FROM t4;
 SELECT count(*) FROM t4;
 -- echo ### check that the incident event is written to the current log
-SET GLOBAL debug="-d,error_unique_log_filename";
+SET GLOBAL debug_dbug="-d,error_unique_log_filename";
 -- let $binlog_limit= 4,1
 -- source include/show_binlog_events.inc
@@ -198,7 +198,7 @@ RESET MASTER;
 ### ASSERTION: check that statements end up in error but they succeed
 ###            on changing the data. 
-SET GLOBAL debug="+d,error_unique_log_filename";
+SET GLOBAL debug_dbug="+d,error_unique_log_filename";
 -- echo # must show 0 entries
 SELECT count(*) FROM t4;
 SELECT count(*) FROM t2;
@@ -229,13 +229,13 @@ SELECT count(*) FROM t4;
 SELECT count(*) FROM t2;
 # remove fault injection
-SET GLOBAL debug="-d,error_unique_log_filename";
+SET GLOBAL debug_dbug="-d,error_unique_log_filename";
 -- echo ###################### TEST #9
 ### ASSERTION: check that if we disable binlogging, then statements
 ###            succeed.
-SET GLOBAL debug="+d,error_unique_log_filename";
+SET GLOBAL debug_dbug="+d,error_unique_log_filename";
 SET SQL_LOG_BIN=0;
 INSERT INTO t2 VALUES ('aaa'), ('bbb'), ('ccc'), ('ddd');
 INSERT INTO t4 VALUES ('eee'), ('fff'), ('ggg'), ('hhh');
@@ -248,7 +248,7 @@ DELETE FROM t4;
 SELECT count(*) FROM t2;
 SELECT count(*) FROM t4;
 SET SQL_LOG_BIN=1;
-SET GLOBAL debug="-d,error_unique_log_filename";
+SET GLOBAL debug_dbug="-d,error_unique_log_filename";
 -- echo ###################### TEST #10
@@ -263,11 +263,11 @@ RESET MASTER;
 SHOW WARNINGS;
 # +d,fault_injection_registering_index => injects fault on MYSQL_BIN_LOG::open
-SET GLOBAL debug="+d,fault_injection_registering_index";
+SET GLOBAL debug_dbug="+d,fault_injection_registering_index";
 -- replace_regex /\.[\\\/]master/master/
 -- error ER_CANT_OPEN_FILE
 FLUSH LOGS;
-SET GLOBAL debug="-d,fault_injection_registering_index";
+SET GLOBAL debug_dbug="-d,fault_injection_registering_index";
 -- error ER_NO_BINARY_LOGGING
 SHOW BINARY LOGS;
@@ -291,11 +291,11 @@ DROP TABLE t5;
 --source include/rpl_restart_server.inc
 # +d,fault_injection_openning_index => injects fault on MYSQL_BIN_LOG::open_index_file
-SET GLOBAL debug="+d,fault_injection_openning_index";
+SET GLOBAL debug_dbug="+d,fault_injection_openning_index";
 -- replace_regex /\.[\\\/]master/master/
 -- error ER_CANT_OPEN_FILE
 FLUSH LOGS;
-SET GLOBAL debug="-d,fault_injection_openning_index";
+SET GLOBAL debug_dbug="-d,fault_injection_openning_index";
 -- error ER_FLUSH_MASTER_BINLOG_CLOSED
 RESET MASTER;
@@ -319,10 +319,10 @@ DROP TABLE t5;
 ###            file.
 # +d,fault_injection_new_file_rotate_event => injects fault on MYSQL_BIN_LOG::MYSQL_BIN_LOG::new_file_impl
-SET GLOBAL debug="+d,fault_injection_new_file_rotate_event";
+SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event";
 -- error ER_ERROR_ON_WRITE
 FLUSH LOGS;
-SET GLOBAL debug="-d,fault_injection_new_file_rotate_event";
+SET GLOBAL debug_dbug="-d,fault_injection_new_file_rotate_event";
 -- error ER_FLUSH_MASTER_BINLOG_CLOSED
 RESET MASTER;
@@ -340,7 +340,7 @@ DROP TABLE t5;
 --source include/rpl_restart_server.inc
 ## clean up
-SET GLOBAL debug= @old_debug;
+SET GLOBAL debug_dbug= @old_debug;
 DROP TABLE t1, t2, t4;
 RESET MASTER;
@@ -398,7 +398,7 @@ call mtr.add_suppression("Can't generate a unique log-filename .*");
 ### clean up
 -- source include/stop_slave_sql.inc
-SET GLOBAL debug=@old_debug;
+SET GLOBAL debug_dbug=@old_debug;
 RESET SLAVE;
 RESET MASTER;
 --let $rpl_only_running_threads= 1

--- a/mysql-test/suite/rpl/t/rpl_bug26395.test
+++ b/mysql-test/suite/rpl/t/rpl_bug26395.test
@@ -12,7 +12,7 @@
 # We want master to be alive so that it can replicate the statement to
 # the slave. So in the test case, we must not crash the
 # master. Instead, we fake the crash by just not writing the XID event
-# to the binlog. This is done by the @@debug='d,do_not_write_xid'
+# to the binlog. This is done by the @@debug_dbug='d,do_not_write_xid'
 # flag. This, in turn, requires us to do 'source
 # include/have_debug.inc'
 #
@@ -48,7 +48,7 @@ SHOW CREATE TABLE tinnodb;
 # do_not_write_xid stops the master from writing an XID event.
 set @old_debug= @@debug;
-set @@debug= 'd,do_not_write_xid';
+set @@debug_dbug= 'd,do_not_write_xid';
 --echo ==== Test ====
@@ -88,7 +88,7 @@ SELECT * FROM tinnodb ORDER BY a;
 --echo [on master]
 connection master;
 DROP TABLE tinnodb;
-set @@debug= @old_debug;
+set @@debug_dbug= @old_debug;
 --echo [on slave]
 connection slave;

--- a/mysql-test/suite/rpl/t/rpl_bug33931.test
+++ b/mysql-test/suite/rpl/t/rpl_bug33931.test
@@ -15,7 +15,7 @@ call mtr.add_suppression("Slave SQL.*Failed during slave thread initialization.*
 reset slave;
 # Set debug flags on slave to force errors to occur
-SET GLOBAL debug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";
+SET GLOBAL debug_dbug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";
 --disable_query_log
 eval CHANGE MASTER TO MASTER_USER='root',
@@ -39,7 +39,7 @@ start slave;
 #
 # Cleanup
 #
-SET GLOBAL debug="";
+SET GLOBAL debug_dbug="";
 # Clear Last_SQL_Error
 RESET SLAVE;

--- a/mysql-test/suite/rpl/t/rpl_bug38694-slave.opt
+++ b/mysql-test/suite/rpl/t/rpl_bug38694-slave.opt
--loose-debug=d,simulate_slave_delay_at_terminate_bug38694
+--loose-debug-dbug=d,simulate_slave_delay_at_terminate_bug38694
--- a/mysql-test/suite/rpl/t/rpl_bug41902.test
+++ b/mysql-test/suite/rpl/t/rpl_bug41902.test
--- a/mysql-test/suite/rpl/t/rpl_checksum.test
+++ b/mysql-test/suite/rpl/t/rpl_checksum.test
--- a/mysql-test/suite/rpl/t/rpl_corruption.test
+++ b/mysql-test/suite/rpl/t/rpl_corruption.test
--- a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
+++ b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
--- a/mysql-test/suite/rpl/t/rpl_init_slave_errors.test
+++ b/mysql-test/suite/rpl/t/rpl_init_slave_errors.test
--- a/mysql-test/suite/rpl/t/rpl_killed_ddl-master.opt
+++ b/mysql-test/suite/rpl/t/rpl_killed_ddl-master.opt
--- a/mysql-test/suite/rpl/t/rpl_row_corruption.test
+++ b/mysql-test/suite/rpl/t/rpl_row_corruption.test
--- a/mysql-test/suite/rpl/t/rpl_row_index_choice.test
+++ b/mysql-test/suite/rpl/t/rpl_row_index_choice.test
--- a/mysql-test/suite/rpl/t/rpl_show_slave_running.test
+++ b/mysql-test/suite/rpl/t/rpl_show_slave_running.test
--- a/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
+++ b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
--- a/mysql-test/suite/rpl/t/rpl_stop_slave.test
+++ b/mysql-test/suite/rpl/t/rpl_stop_slave.test
--- a/mysql-test/suite/rpl/t/rpl_sync.test
+++ b/mysql-test/suite/rpl/t/rpl_sync.test
--- a/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt
+++ b/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt
--- a/mysql-test/suite/sys_vars/r/debug_basic.result
+++ b/mysql-test/suite/sys_vars/r/debug_basic.result
--- a/mysql-test/suite/sys_vars/r/debug_dbug_basic.result
+++ b/mysql-test/suite/sys_vars/r/debug_dbug_basic.result
--- a/mysql-test/suite/sys_vars/t/debug_dbug_basic.test
+++ b/mysql-test/suite/sys_vars/t/debug_dbug_basic.test
--- a/mysql-test/t/alter_table-big.test
+++ b/mysql-test/t/alter_table-big.test
--- a/mysql-test/t/archive_debug.test
+++ b/mysql-test/t/archive_debug.test
--- a/mysql-test/t/crash_commit_before.test
+++ b/mysql-test/t/crash_commit_before.test
--- a/mysql-test/t/create-big.test
+++ b/mysql-test/t/create-big.test
--- a/mysql-test/t/drop_debug.test
+++ b/mysql-test/t/drop_debug.test
--- a/mysql-test/t/error_simulation.test
+++ b/mysql-test/t/error_simulation.test
--- a/mysql-test/t/filesort_debug.test
+++ b/mysql-test/t/filesort_debug.test
--- a/mysql-test/t/information_schema_all_engines.test
+++ b/mysql-test/t/information_schema_all_engines.test
--- a/mysql-test/t/innodb_mysql_sync.test
+++ b/mysql-test/t/innodb_mysql_sync.test
--- a/mysql-test/t/log_tables_debug.test
+++ b/mysql-test/t/log_tables_debug.test
--- a/mysql-test/t/merge-big.test
+++ b/mysql-test/t/merge-big.test
--- a/mysql-test/t/merge_debug.test
+++ b/mysql-test/t/merge_debug.test
--- a/mysql-test/t/myisam_crash_before_flush_keys.test
+++ b/mysql-test/t/myisam_crash_before_flush_keys.test
--- a/mysql-test/t/myisam_debug.test
+++ b/mysql-test/t/myisam_debug.test
--- a/mysql-test/t/mysqldump-compat.opt
+++ b/mysql-test/t/mysqldump-compat.opt
--- a/mysql-test/t/partition_debug_sync.test
+++ b/mysql-test/t/partition_debug_sync.test
--- a/mysql-test/t/partition_sync.test
+++ b/mysql-test/t/partition_sync.test
--- a/mysql-test/t/select_debug.test
+++ b/mysql-test/t/select_debug.test
--- a/mysql-test/t/sp-code.test
+++ b/mysql-test/t/sp-code.test
--- a/mysql-test/t/subselect_debug.test
+++ b/mysql-test/t/subselect_debug.test
--- a/mysql-test/t/variables_debug.test
+++ b/mysql-test/t/variables_debug.test
--- a/mysql-test/t/variables_debug_notembedded.test
+++ b/mysql-test/t/variables_debug_notembedded.test
--- a/mysql-test/t/warnings_debug.test
+++ b/mysql-test/t/warnings_debug.test
--- a/mysys/md5.c
+++ b/mysys/md5.c
--- a/plugin/win_auth_client/handshake_client.cc
+++ b/plugin/win_auth_client/handshake_client.cc
--- a/scripts/convert-debug-for-diff.sh
+++ b/scripts/convert-debug-for-diff.sh
--- a/sql/debug_sync.cc
+++ b/sql/debug_sync.cc
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
--- a/storage/federatedx/ha_federatedx.cc
+++ b/storage/federatedx/ha_federatedx.cc