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.

20 files changed, 130 insertions, 130 deletions

diff --git a/mysql-test/r/archive_debug.result b/mysql-test/r/archive_debug.result
index cc5a3761a99..7bc6a113217 100644
--- 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;
diff --git a/mysql-test/r/crash_commit_before.result b/mysql-test/r/crash_commit_before.result
index 2062754bb80..22d39e1ddbd 100644
--- a/mysql-test/r/crash_commit_before.result
+++ b/mysql-test/r/crash_commit_before.result
@@ -1,7 +1,7 @@
 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;
diff --git a/mysql-test/r/drop_debug.result b/mysql-test/r/drop_debug.result
index f2c89034451..852b3ac2163 100644
--- 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.
diff --git a/mysql-test/r/error_simulation.result b/mysql-test/r/error_simulation.result
index b6b79cb596b..ae47527145a 100644
--- 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
diff --git a/mysql-test/r/filesort_debug.result b/mysql-test/r/filesort_debug.result
index c35a6753353..6759cf13502 100644
--- 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
diff --git a/mysql-test/r/information_schema_all_engines.result b/mysql-test/r/information_schema_all_engines.result
index e8fafccd0b2..9ea7c947100 100644
--- 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_LOCKS
+INNODB_INDEX_STATS
+INNODB_CMP
 INNODB_SYS_FOREIGN_COLS
 INNODB_CMP_RESET
 INNODB_BUFFER_POOL_PAGES
-INNODB_SYS_TABLES
-PBXT_STATISTICS
-INNODB_CMPMEM
+INNODB_TRX
+INNODB_BUFFER_POOL_PAGES_INDEX
+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_LOCKS	lock_id
+INNODB_INDEX_STATS	table_schema
+INNODB_CMP	page_size
 INNODB_SYS_FOREIGN_COLS	ID
 INNODB_CMP_RESET	page_size
 INNODB_BUFFER_POOL_PAGES	page_type
-INNODB_SYS_TABLES	SCHEMA
-PBXT_STATISTICS	ID
-INNODB_CMPMEM	page_size
+INNODB_TRX	trx_id
+INNODB_BUFFER_POOL_PAGES_INDEX	index_id
+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_LOCKS	lock_id
+INNODB_INDEX_STATS	table_schema
+INNODB_CMP	page_size
 INNODB_SYS_FOREIGN_COLS	ID
 INNODB_CMP_RESET	page_size
 INNODB_BUFFER_POOL_PAGES	page_type
-INNODB_SYS_TABLES	SCHEMA
-PBXT_STATISTICS	ID
-INNODB_CMPMEM	page_size
+INNODB_TRX	trx_id
+INNODB_BUFFER_POOL_PAGES_INDEX	index_id
+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_LOCKS                          |
+| INNODB_INDEX_STATS                    |
+| INNODB_CMP                            |
 | INNODB_SYS_FOREIGN_COLS               |
 | INNODB_CMP_RESET                      |
 | INNODB_BUFFER_POOL_PAGES              |
-| INNODB_SYS_TABLES                     |
-| PBXT_STATISTICS                       |
-| INNODB_CMPMEM                         |
+| INNODB_TRX                            |
+| INNODB_BUFFER_POOL_PAGES_INDEX        |
+| 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_LOCKS                          |
+| INNODB_INDEX_STATS                    |
+| INNODB_CMP                            |
 | INNODB_SYS_FOREIGN_COLS               |
 | INNODB_CMP_RESET                      |
 | INNODB_BUFFER_POOL_PAGES              |
-| INNODB_SYS_TABLES                     |
-| PBXT_STATISTICS                       |
-| INNODB_CMPMEM                         |
+| INNODB_TRX                            |
+| INNODB_BUFFER_POOL_PAGES_INDEX        |
+| 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
 +--------------------+
diff --git a/mysql-test/r/innodb_mysql_sync.result b/mysql-test/r/innodb_mysql_sync.result
index 605aaf4df5a..58254412c5b 100644
--- 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;
diff --git a/mysql-test/r/log_tables_debug.result b/mysql-test/r/log_tables_debug.result
index daedb8c103a..39983339572 100644
--- 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
 #
diff --git a/mysql-test/r/merge_debug.result b/mysql-test/r/merge_debug.result
index 869d9e7536c..ff7222ac0f3 100644
--- 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);
diff --git a/mysql-test/r/myisam_crash_before_flush_keys.result b/mysql-test/r/myisam_crash_before_flush_keys.result
index 43eb1625409..ab7eabfa614 100644
--- 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;
diff --git a/mysql-test/r/myisam_debug.result b/mysql-test/r/myisam_debug.result
index 7268113552f..36a8fe6c724 100644
--- 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
diff --git a/mysql-test/r/partition_debug_sync.result b/mysql-test/r/partition_debug_sync.result
index 6b8c8e48acc..ad0f6df5ff2 100644
--- 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';
diff --git a/mysql-test/r/partition_sync.result b/mysql-test/r/partition_sync.result
index d48362cb57c..0e8254e984e 100644
--- 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
diff --git a/mysql-test/r/select_debug.result b/mysql-test/r/select_debug.result
index 1eb8a0754fa..a056affc2cd 100644
--- 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
diff --git a/mysql-test/r/sp-code.result b/mysql-test/r/sp-code.result
index 16a43a00f04..fd2e79dff29 100644
--- 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;
diff --git a/mysql-test/r/sp-no-code.result b/mysql-test/r/sp-no-code.result
index 77d2c93eaf6..762b481a7cb 100644
--- a/mysql-test/r/sp-no-code.result
+++ b/mysql-test/r/sp-no-code.result
@@ -1,4 +1,4 @@
 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
diff --git a/mysql-test/r/subselect_debug.result b/mysql-test/r/subselect_debug.result
index 54610d51d78..1d54369530b 100644
--- 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;
diff --git a/mysql-test/r/variables_debug.result b/mysql-test/r/variables_debug.result
index 63592b2146c..064769a562b 100644
--- a/mysql-test/r/variables_debug.result
+++ b/mysql-test/r/variables_debug.result
@@ -1,20 +1,20 @@
 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 SESSION debug= '-d:-t:-i';
-SET GLOBAL  debug= '';
-SET SESSION debug= '';
+SET GLOBAL  debug_dbug= '+O,../../log/bug46165.1.trace';
+SET SESSION debug_dbug= '-d:-t:-i';
+SET GLOBAL  debug_dbug= '';
+SET SESSION debug_dbug= '';
 # Test 2 - Bug test case, two connections
 # Connection default
-SET GLOBAL  debug= '+O,../../log/bug46165.2.trace';
-SET SESSION debug= '-d:-t:-i';
+SET GLOBAL  debug_dbug= '+O,../../log/bug46165.2.trace';
+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 SESSION debug= '-d:-t:-i';
-SET GLOBAL  debug= '';
+SET GLOBAL  debug_dbug= '+O,../../log/bug46165.3.trace';
+SET SESSION debug_dbug= '-d:-t:-i';
+SET GLOBAL  debug_dbug= '';
 # Test 4 - Active session trace file on two connections
 # Connection default
-SET GLOBAL  debug= '+O,../../log/bug46165.4.trace';
-SET SESSION debug= '-d:-t:-i';
+SET GLOBAL  debug_dbug= '+O,../../log/bug46165.4.trace';
+SET SESSION debug_dbug= '-d:-t:-i';
 # Connection con1
-SET SESSION debug= '-d:-t:-i';
-SET GLOBAL  debug= '';
-SET SESSION debug= '';
+SET SESSION debug_dbug= '-d:-t:-i';
+SET GLOBAL  debug_dbug= '';
+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= '+O,../../log/bug46165.6.trace';
-SET SESSION debug= '-O';
-SET GLOBAL  debug= @old_globaldebug;
-SET SESSION debug= @old_sessiondebug;
+SET SESSION debug_dbug= '+O,../../log/bug46165.5.trace';
+SET SESSION debug_dbug= '+O,../../log/bug46165.6.trace';
+SET SESSION debug_dbug= '-O';
+SET GLOBAL  debug_dbug= @old_globaldebug;
+SET SESSION debug_dbug= @old_sessiondebug;
diff --git a/mysql-test/r/variables_debug_notembedded.result b/mysql-test/r/variables_debug_notembedded.result
index 410bbddda2d..81a251a85ab 100644
--- a/mysql-test/r/variables_debug_notembedded.result
+++ b/mysql-test/r/variables_debug_notembedded.result
@@ -1,12 +1,12 @@
-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
diff --git a/mysql-test/r/warnings_debug.result b/mysql-test/r/warnings_debug.result
index 08908bf0437..4cdce7a5feb 100644
--- a/mysql-test/r/warnings_debug.result
+++ b/mysql-test/r/warnings_debug.result
@@ -1,6 +1,6 @@
 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