diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-12-15 22:07:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-12-15 22:07:58 +0100 |
| commit | 1efdd5a572ef202f64ef43d1868b021cf8c60873 (patch) | |
| tree | c68816016f9d44769d8205cde2f99636d90fe6a3 /mysql-test | |
| parent | b86ba751daf208f38aaa98672d10733fd7173eae (diff) | |
| download | mariadb-git-1efdd5a572ef202f64ef43d1868b021cf8c60873.tar.gz | |
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.
Diffstat (limited to 'mysql-test')
138 files changed, 1021 insertions, 973 deletions
diff --git 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 index 01036f72785..1ef8544884d 100644 --- 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 diff --git a/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test b/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test index 977d93ec36d..43c561c5b85 100644 --- 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="+d,incomplete_group_in_relay_log"; +set @@global.debug_dbug="+d,stop_slave_middle_group"; +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="+d,incomplete_group_in_relay_log"; +set @@global.debug_dbug="+d,stop_slave_middle_group"; +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 diff --git a/mysql-test/include/binlog_inject_error.inc b/mysql-test/include/binlog_inject_error.inc index 6465f7943a4..383f66ba843 100644 --- 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=''; diff --git a/mysql-test/include/check-warnings.test b/mysql-test/include/check-warnings.test index fab7fb2cff6..3a26f7eecb1 100644 --- 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; diff --git a/mysql-test/include/io_thd_fault_injection.inc b/mysql-test/include/io_thd_fault_injection.inc index 7cbe055dbf6..11479b3a66c 100644 --- 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" -SET GLOBAL debug=@old_debug; +-- eval SET GLOBAL debug_dbug="-d,$io_thd_injection_fault_flag" +SET GLOBAL debug_dbug=@old_debug; # restart because slave is in bad shape --let $rpl_server_number= 2 diff --git a/mysql-test/include/maria_verify_recovery.inc b/mysql-test/include/maria_verify_recovery.inc index 71292947c80..9b56061b2b4 100644 --- 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) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index a8a2a515196..ad64e6e37d7 100755 --- 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()); } 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 diff --git a/mysql-test/suite/binlog/r/binlog_index.result b/mysql-test/suite/binlog/r/binlog_index.result index 21a290bfc3b..ca92cc5398b 100644 --- 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 diff --git a/mysql-test/suite/binlog/r/binlog_ioerr.result b/mysql-test/suite/binlog/r/binlog_ioerr.result index 04ac0340746..9dd927b9299 100644 --- 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 diff --git a/mysql-test/suite/binlog/r/binlog_write_error.result b/mysql-test/suite/binlog/r/binlog_write_error.result index dd8bdb9715a..28cffb3a8e5 100644 --- 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='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +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='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +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='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +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='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +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='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +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='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +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='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +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='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +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='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +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='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +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='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +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='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +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='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +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='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +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='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +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 # diff --git a/mysql-test/suite/binlog/t/binlog_index.test b/mysql-test/suite/binlog/t/binlog_index.test index 86c314e9236..a264549ce17 100644 --- 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 diff --git a/mysql-test/suite/binlog/t/binlog_ioerr.test b/mysql-test/suite/binlog/t/binlog_ioerr.test index e6f559c1a7b..f23fadfc1b4 100644 --- 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; diff --git a/mysql-test/suite/binlog/t/binlog_reset_master.test b/mysql-test/suite/binlog/t/binlog_reset_master.test index b7ad69da3ea..33b549ad357 100644 --- 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 diff --git a/mysql-test/suite/innodb/r/group_commit_binlog_pos.result b/mysql-test/suite/innodb/r/group_commit_binlog_pos.result index 79ade2acec7..d28ad1fd70e 100644 --- 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 diff --git 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 index e6ea24a67bd..da8cff142b8 100644 --- 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 diff --git a/mysql-test/suite/innodb/r/group_commit_crash.result b/mysql-test/suite/innodb/r/group_commit_crash.result index a55d8f29dda..333e47f38ad 100644 --- 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 2 THEN SET SESSION debug="d,crash_commit_after_log"; -WHEN 3 THEN SET SESSION debug="d,crash_commit_before_unlog"; -WHEN 4 THEN SET SESSION debug="d,crash_commit_after"; -WHEN 5 THEN SET SESSION debug="d,crash_commit_before"; +WHEN 1 THEN SET SESSION debug_dbug="d,crash_commit_after_prepare"; +WHEN 2 THEN SET SESSION debug_dbug="d,crash_commit_after_log"; +WHEN 3 THEN SET SESSION debug_dbug="d,crash_commit_before_unlog"; +WHEN 4 THEN SET SESSION debug_dbug="d,crash_commit_after"; +WHEN 5 THEN SET SESSION debug_dbug="d,crash_commit_before"; ELSE BEGIN END; END CASE; end // diff --git 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 index a55d8f29dda..333e47f38ad 100644 --- 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 2 THEN SET SESSION debug="d,crash_commit_after_log"; -WHEN 3 THEN SET SESSION debug="d,crash_commit_before_unlog"; -WHEN 4 THEN SET SESSION debug="d,crash_commit_after"; -WHEN 5 THEN SET SESSION debug="d,crash_commit_before"; +WHEN 1 THEN SET SESSION debug_dbug="d,crash_commit_after_prepare"; +WHEN 2 THEN SET SESSION debug_dbug="d,crash_commit_after_log"; +WHEN 3 THEN SET SESSION debug_dbug="d,crash_commit_before_unlog"; +WHEN 4 THEN SET SESSION debug_dbug="d,crash_commit_after"; +WHEN 5 THEN SET SESSION debug_dbug="d,crash_commit_before"; ELSE BEGIN END; END CASE; end // diff --git a/mysql-test/suite/innodb/r/innodb_bug53756.result b/mysql-test/suite/innodb/r/innodb_bug53756.result index 37453be8201..2a2a30e2482 100644 --- 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 diff --git a/mysql-test/suite/innodb/t/group_commit_binlog_pos.test b/mysql-test/suite/innodb/t/group_commit_binlog_pos.test index 686425353f5..5e70db68a97 100644 --- 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; diff --git 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 index bd6c4b721cc..dba9c0589cf 100644 --- 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; diff --git a/mysql-test/suite/innodb/t/group_commit_crash.test b/mysql-test/suite/innodb/t/group_commit_crash.test index 0d5eba6bd08..10b0e102bea 100644 --- 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 2 THEN SET SESSION debug="d,crash_commit_after_log"; - WHEN 3 THEN SET SESSION debug="d,crash_commit_before_unlog"; - WHEN 4 THEN SET SESSION debug="d,crash_commit_after"; - WHEN 5 THEN SET SESSION debug="d,crash_commit_before"; + WHEN 1 THEN SET SESSION debug_dbug="d,crash_commit_after_prepare"; + WHEN 2 THEN SET SESSION debug_dbug="d,crash_commit_after_log"; + WHEN 3 THEN SET SESSION debug_dbug="d,crash_commit_before_unlog"; + WHEN 4 THEN SET SESSION debug_dbug="d,crash_commit_after"; + WHEN 5 THEN SET SESSION debug_dbug="d,crash_commit_before"; ELSE BEGIN END; END CASE; end // diff --git 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 index 0d5eba6bd08..10b0e102bea 100644 --- 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 2 THEN SET SESSION debug="d,crash_commit_after_log"; - WHEN 3 THEN SET SESSION debug="d,crash_commit_before_unlog"; - WHEN 4 THEN SET SESSION debug="d,crash_commit_after"; - WHEN 5 THEN SET SESSION debug="d,crash_commit_before"; + WHEN 1 THEN SET SESSION debug_dbug="d,crash_commit_after_prepare"; + WHEN 2 THEN SET SESSION debug_dbug="d,crash_commit_after_log"; + WHEN 3 THEN SET SESSION debug_dbug="d,crash_commit_before_unlog"; + WHEN 4 THEN SET SESSION debug_dbug="d,crash_commit_after"; + WHEN 5 THEN SET SESSION debug_dbug="d,crash_commit_before"; ELSE BEGIN END; END CASE; end // diff --git a/mysql-test/suite/innodb/t/innodb_bug53756.test b/mysql-test/suite/innodb/t/innodb_bug53756.test index b0e15c1686e..ba66c9d8eb3 100644 --- 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 diff --git a/mysql-test/suite/maria/r/maria-recovery-bitmap.result b/mysql-test/suite/maria/r/maria-recovery-bitmap.result index 884825d4792..e3697334239 100644 --- 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 diff --git a/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result b/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result index 778d8ba9911..030421ae06a 100644 --- 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 diff --git a/mysql-test/suite/maria/r/maria-recovery.result b/mysql-test/suite/maria/r/maria-recovery.result index 8d5da9b7269..86e756badec 100644 --- 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 diff --git a/mysql-test/suite/maria/r/maria-recovery2.result b/mysql-test/suite/maria/r/maria-recovery2.result index 1d1ede3001e..2c92bb8dace 100644 --- 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 diff --git a/mysql-test/suite/maria/r/maria-recovery3.result b/mysql-test/suite/maria/r/maria-recovery3.result index 5ba9ecc8349..12c3d0ae034 100644 --- 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 diff --git a/mysql-test/suite/maria/t/maria-recovery-bitmap.test b/mysql-test/suite/maria/t/maria-recovery-bitmap.test index 856785a04a8..4c7956fbc30 100644 --- 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; diff --git a/mysql-test/suite/maria/t/maria-recovery2.test b/mysql-test/suite/maria/t/maria-recovery2.test index c1081d033ac..8d27d9aaaac 100644 --- 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; diff --git a/mysql-test/suite/maria/t/maria-recovery3.test b/mysql-test/suite/maria/t/maria-recovery3.test index a5fd55499a2..02babfccf83 100644 --- 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 diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug36981.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug36981.result index 1b0a9c636e7..760d7342752 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug36981.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug36981.result @@ -1,4 +1,4 @@ -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; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug40992.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug40992.result index 9c30b32e1e5..5e53649c538 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug40992.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug40992.result @@ -1,7 +1,7 @@ # # 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, diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41029.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41029.result index d65feac5a0b..6b3025af842 100644 --- 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; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996.result index e42f61376c4..bad32010c8c 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996.result @@ -1,4 +1,4 @@ -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' diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug42991.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug42991.result index 0daa91361c2..4586fe84d2d 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug42991.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug42991.result @@ -1,4 +1,4 @@ -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 */; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43249.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43249.result index c60a830b899..0cd801280c8 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43249.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43249.result @@ -1,4 +1,4 @@ -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'); diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43360.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43360.result index a6f4fcd0018..33a4d5c2f30 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43360.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43360.result @@ -1,7 +1,7 @@ # # 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, diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43448.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43448.result index 9c9d99837cc..a8f56923386 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43448.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43448.result @@ -1,7 +1,7 @@ # # 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) diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result index 562fe4785d5..3c19a37c95d 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result @@ -1,7 +1,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"; 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: diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug36981.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug36981.test index 586602c7ae8..da9de306b09 100644 --- 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`)) diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug40992.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug40992.test index 36fe7c4a60f..b16f55aa951 100644 --- 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, diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug41029.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug41029.test index ff3dd4964af..b7c0dc5332c 100644 --- 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; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug41996.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug41996.test index b8040b9714a..7d6237fa536 100644 --- 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; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test index d3eb1e726a2..6c6b416df8a 100644 --- 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 */;
diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43101.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43101.test index 7dd921806bf..186512d5e65 100644 --- 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)); diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43249.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43249.test index 827220b0a6f..6275038a650 100644 --- 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; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43360.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43360.test index 0d1e4740712..d8b8b1f64a3 100644 --- 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, diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43448.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43448.test index 0b1e560b58d..f7f40a6d3bf 100644 --- 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, diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test index 2b3b65577af..4a3544958d2 100644 --- 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 ######## diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43618.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43618.test index e05ea3ee4f5..02e93cdf01a 100644 --- 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 ######## diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug45221.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug45221.test index e60c7818b19..aab93a72725 100644 --- 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"; diff --git a/mysql-test/suite/parts/inc/partition_crash_add.inc b/mysql-test/suite/parts/inc/partition_crash_add.inc index c7cec9c8791..fcd058562c0 100644 --- a/mysql-test/suite/parts/inc/partition_crash_add.inc +++ b/mysql-test/suite/parts/inc/partition_crash_add.inc @@ -1,33 +1,33 @@ # 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="+d,crash_add_partition_2"; +SET SESSION debug_dbug="-d,crash_add_partition_1"; +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="+d,crash_add_partition_3"; +SET SESSION debug_dbug="-d,crash_add_partition_2"; +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="+d,crash_add_partition_4"; +SET SESSION debug_dbug="-d,crash_add_partition_3"; +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="+d,crash_add_partition_5"; +SET SESSION debug_dbug="-d,crash_add_partition_4"; +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="+d,crash_add_partition_6"; +SET SESSION debug_dbug="-d,crash_add_partition_5"; +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="+d,crash_add_partition_7"; +SET SESSION debug_dbug="-d,crash_add_partition_6"; +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="+d,crash_add_partition_8"; +SET SESSION debug_dbug="-d,crash_add_partition_7"; +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="+d,crash_add_partition_9"; +SET SESSION debug_dbug="-d,crash_add_partition_8"; +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="+d,crash_add_partition_10"; +SET SESSION debug_dbug="-d,crash_add_partition_9"; +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"; diff --git a/mysql-test/suite/parts/inc/partition_crash_change.inc b/mysql-test/suite/parts/inc/partition_crash_change.inc index 2a6630b6537..ba9dd9cbdc8 100644 --- 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="+d,crash_change_partition_2"; +SET SESSION debug_dbug="-d,crash_change_partition_1"; +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="+d,crash_change_partition_3"; +SET SESSION debug_dbug="-d,crash_change_partition_2"; +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="+d,crash_change_partition_4"; +SET SESSION debug_dbug="-d,crash_change_partition_3"; +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="+d,crash_change_partition_5"; +SET SESSION debug_dbug="-d,crash_change_partition_4"; +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="+d,crash_change_partition_6"; +SET SESSION debug_dbug="-d,crash_change_partition_5"; +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="+d,crash_change_partition_7"; +SET SESSION debug_dbug="-d,crash_change_partition_6"; +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="+d,crash_change_partition_8"; +SET SESSION debug_dbug="-d,crash_change_partition_7"; +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="+d,crash_change_partition_9"; +SET SESSION debug_dbug="-d,crash_change_partition_8"; +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="+d,crash_change_partition_10"; +SET SESSION debug_dbug="-d,crash_change_partition_9"; +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="+d,crash_change_partition_11"; +SET SESSION debug_dbug="-d,crash_change_partition_10"; +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="+d,crash_change_partition_12"; +SET SESSION debug_dbug="-d,crash_change_partition_11"; +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"; diff --git a/mysql-test/suite/parts/inc/partition_crash_drop.inc b/mysql-test/suite/parts/inc/partition_crash_drop.inc index 0e35e126f4e..91787cdecdc 100644 --- a/mysql-test/suite/parts/inc/partition_crash_drop.inc +++ b/mysql-test/suite/parts/inc/partition_crash_drop.inc @@ -1,30 +1,30 @@ # 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="+d,crash_drop_partition_2"; +SET SESSION debug_dbug="-d,crash_drop_partition_1"; +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="+d,crash_drop_partition_3"; +SET SESSION debug_dbug="-d,crash_drop_partition_2"; +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="+d,crash_drop_partition_4"; +SET SESSION debug_dbug="-d,crash_drop_partition_3"; +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="+d,crash_drop_partition_5"; +SET SESSION debug_dbug="-d,crash_drop_partition_4"; +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="+d,crash_drop_partition_6"; +SET SESSION debug_dbug="-d,crash_drop_partition_5"; +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="+d,crash_drop_partition_7"; +SET SESSION debug_dbug="-d,crash_drop_partition_6"; +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="+d,crash_drop_partition_8"; +SET SESSION debug_dbug="-d,crash_drop_partition_7"; +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="+d,crash_drop_partition_9"; +SET SESSION debug_dbug="-d,crash_drop_partition_8"; +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"; diff --git a/mysql-test/suite/parts/inc/partition_fail_add.inc b/mysql-test/suite/parts/inc/partition_fail_add.inc index 71d09792fd1..72978458e0b 100644 --- a/mysql-test/suite/parts/inc/partition_fail_add.inc +++ b/mysql-test/suite/parts/inc/partition_fail_add.inc @@ -1,33 +1,33 @@ # 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="+d,fail_add_partition_2"; +SET SESSION debug_dbug="-d,fail_add_partition_1"; +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="+d,fail_add_partition_3"; +SET SESSION debug_dbug="-d,fail_add_partition_2"; +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="+d,fail_add_partition_4"; +SET SESSION debug_dbug="-d,fail_add_partition_3"; +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="+d,fail_add_partition_5"; +SET SESSION debug_dbug="-d,fail_add_partition_4"; +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="+d,fail_add_partition_6"; +SET SESSION debug_dbug="-d,fail_add_partition_5"; +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="+d,fail_add_partition_7"; +SET SESSION debug_dbug="-d,fail_add_partition_6"; +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="+d,fail_add_partition_8"; +SET SESSION debug_dbug="-d,fail_add_partition_7"; +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="+d,fail_add_partition_9"; +SET SESSION debug_dbug="-d,fail_add_partition_8"; +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="+d,fail_add_partition_10"; +SET SESSION debug_dbug="-d,fail_add_partition_9"; +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"; diff --git a/mysql-test/suite/parts/inc/partition_fail_change.inc b/mysql-test/suite/parts/inc/partition_fail_change.inc index 390dea34fab..0c576d990fe 100644 --- 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="+d,fail_change_partition_2"; +SET SESSION debug_dbug="-d,fail_change_partition_1"; +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="+d,fail_change_partition_3"; +SET SESSION debug_dbug="-d,fail_change_partition_2"; +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="+d,fail_change_partition_4"; +SET SESSION debug_dbug="-d,fail_change_partition_3"; +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="+d,fail_change_partition_5"; +SET SESSION debug_dbug="-d,fail_change_partition_4"; +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="+d,fail_change_partition_6"; +SET SESSION debug_dbug="-d,fail_change_partition_5"; +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="+d,fail_change_partition_7"; +SET SESSION debug_dbug="-d,fail_change_partition_6"; +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="+d,fail_change_partition_8"; +SET SESSION debug_dbug="-d,fail_change_partition_7"; +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="+d,fail_change_partition_9"; +SET SESSION debug_dbug="-d,fail_change_partition_8"; +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="+d,fail_change_partition_10"; +SET SESSION debug_dbug="-d,fail_change_partition_9"; +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="+d,fail_change_partition_11"; +SET SESSION debug_dbug="-d,fail_change_partition_10"; +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="+d,fail_change_partition_12"; +SET SESSION debug_dbug="-d,fail_change_partition_11"; +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"; diff --git a/mysql-test/suite/parts/inc/partition_fail_drop.inc b/mysql-test/suite/parts/inc/partition_fail_drop.inc index 54a57ba845f..ca9bcf7d7a3 100644 --- a/mysql-test/suite/parts/inc/partition_fail_drop.inc +++ b/mysql-test/suite/parts/inc/partition_fail_drop.inc @@ -1,30 +1,30 @@ # 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="+d,fail_drop_partition_2"; +SET SESSION debug_dbug="-d,fail_drop_partition_1"; +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="+d,fail_drop_partition_3"; +SET SESSION debug_dbug="-d,fail_drop_partition_2"; +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="+d,fail_drop_partition_4"; +SET SESSION debug_dbug="-d,fail_drop_partition_3"; +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="+d,fail_drop_partition_5"; +SET SESSION debug_dbug="-d,fail_drop_partition_4"; +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="+d,fail_drop_partition_6"; +SET SESSION debug_dbug="-d,fail_drop_partition_5"; +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="+d,fail_drop_partition_7"; +SET SESSION debug_dbug="-d,fail_drop_partition_6"; +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="+d,fail_drop_partition_8"; +SET SESSION debug_dbug="-d,fail_drop_partition_7"; +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="+d,fail_drop_partition_9"; +SET SESSION debug_dbug="-d,fail_drop_partition_8"; +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"; diff --git a/mysql-test/suite/parts/r/partition_debug_innodb.result b/mysql-test/suite/parts/r/partition_debug_innodb.result index 49d863bca8e..aff45690de3 100644 --- a/mysql-test/suite/parts/r/partition_debug_innodb.result +++ b/mysql-test/suite/parts/r/partition_debug_innodb.result @@ -11,7 +11,7 @@ call mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop table "); # Extended crash recovery testing of fast_alter_partition_table. call mtr.add_suppression("Attempting backtrace. You can use the following information to find out"); # Crash testing ADD PARTITION -SET SESSION debug="+d,crash_add_partition_1"; +SET SESSION debug_dbug="+d,crash_add_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -75,8 +75,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_1"; -SET SESSION debug="+d,crash_add_partition_2"; +SET SESSION debug_dbug="-d,crash_add_partition_1"; +SET SESSION debug_dbug="+d,crash_add_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -142,8 +142,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_2"; -SET SESSION debug="+d,crash_add_partition_3"; +SET SESSION debug_dbug="-d,crash_add_partition_2"; +SET SESSION debug_dbug="+d,crash_add_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -209,8 +209,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_3"; -SET SESSION debug="+d,crash_add_partition_4"; +SET SESSION debug_dbug="-d,crash_add_partition_3"; +SET SESSION debug_dbug="+d,crash_add_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -276,8 +276,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_4"; -SET SESSION debug="+d,crash_add_partition_5"; +SET SESSION debug_dbug="-d,crash_add_partition_4"; +SET SESSION debug_dbug="+d,crash_add_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -344,8 +344,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_5"; -SET SESSION debug="+d,crash_add_partition_6"; +SET SESSION debug_dbug="-d,crash_add_partition_5"; +SET SESSION debug_dbug="+d,crash_add_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -412,8 +412,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_6"; -SET SESSION debug="+d,crash_add_partition_7"; +SET SESSION debug_dbug="-d,crash_add_partition_6"; +SET SESSION debug_dbug="+d,crash_add_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -480,8 +480,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_7"; -SET SESSION debug="+d,crash_add_partition_8"; +SET SESSION debug_dbug="-d,crash_add_partition_7"; +SET SESSION debug_dbug="+d,crash_add_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -550,8 +550,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_8"; -SET SESSION debug="+d,crash_add_partition_9"; +SET SESSION debug_dbug="-d,crash_add_partition_8"; +SET SESSION debug_dbug="+d,crash_add_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -618,8 +618,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_9"; -SET SESSION debug="+d,crash_add_partition_10"; +SET SESSION debug_dbug="-d,crash_add_partition_9"; +SET SESSION debug_dbug="+d,crash_add_partition_10"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -686,9 +686,9 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_10"; +SET SESSION debug_dbug="-d,crash_add_partition_10"; # Error recovery testing ADD PARTITION -SET SESSION debug="+d,fail_add_partition_1"; +SET SESSION debug_dbug="+d,fail_add_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -808,8 +808,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_1"; -SET SESSION debug="+d,fail_add_partition_2"; +SET SESSION debug_dbug="-d,fail_add_partition_1"; +SET SESSION debug_dbug="+d,fail_add_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -929,8 +929,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_2"; -SET SESSION debug="+d,fail_add_partition_3"; +SET SESSION debug_dbug="-d,fail_add_partition_2"; +SET SESSION debug_dbug="+d,fail_add_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1050,8 +1050,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_3"; -SET SESSION debug="+d,fail_add_partition_4"; +SET SESSION debug_dbug="-d,fail_add_partition_3"; +SET SESSION debug_dbug="+d,fail_add_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1171,8 +1171,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_4"; -SET SESSION debug="+d,fail_add_partition_5"; +SET SESSION debug_dbug="-d,fail_add_partition_4"; +SET SESSION debug_dbug="+d,fail_add_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1292,8 +1292,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_5"; -SET SESSION debug="+d,fail_add_partition_6"; +SET SESSION debug_dbug="-d,fail_add_partition_5"; +SET SESSION debug_dbug="+d,fail_add_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1413,8 +1413,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_6"; -SET SESSION debug="+d,fail_add_partition_7"; +SET SESSION debug_dbug="-d,fail_add_partition_6"; +SET SESSION debug_dbug="+d,fail_add_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1534,8 +1534,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_7"; -SET SESSION debug="+d,fail_add_partition_8"; +SET SESSION debug_dbug="-d,fail_add_partition_7"; +SET SESSION debug_dbug="+d,fail_add_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1659,8 +1659,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_8"; -SET SESSION debug="+d,fail_add_partition_9"; +SET SESSION debug_dbug="-d,fail_add_partition_8"; +SET SESSION debug_dbug="+d,fail_add_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1784,8 +1784,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_9"; -SET SESSION debug="+d,fail_add_partition_10"; +SET SESSION debug_dbug="-d,fail_add_partition_9"; +SET SESSION debug_dbug="+d,fail_add_partition_10"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1909,9 +1909,9 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_10"; +SET SESSION debug_dbug="-d,fail_add_partition_10"; # Test DROP PARTITION -SET SESSION debug="+d,crash_drop_partition_1"; +SET SESSION debug_dbug="+d,crash_drop_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1974,8 +1974,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_1"; -SET SESSION debug="+d,crash_drop_partition_2"; +SET SESSION debug_dbug="-d,crash_drop_partition_1"; +SET SESSION debug_dbug="+d,crash_drop_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2040,8 +2040,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_2"; -SET SESSION debug="+d,crash_drop_partition_3"; +SET SESSION debug_dbug="-d,crash_drop_partition_2"; +SET SESSION debug_dbug="+d,crash_drop_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2106,8 +2106,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_3"; -SET SESSION debug="+d,crash_drop_partition_4"; +SET SESSION debug_dbug="-d,crash_drop_partition_3"; +SET SESSION debug_dbug="+d,crash_drop_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2166,8 +2166,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_4"; -SET SESSION debug="+d,crash_drop_partition_5"; +SET SESSION debug_dbug="-d,crash_drop_partition_4"; +SET SESSION debug_dbug="+d,crash_drop_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2226,8 +2226,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_5"; -SET SESSION debug="+d,crash_drop_partition_6"; +SET SESSION debug_dbug="-d,crash_drop_partition_5"; +SET SESSION debug_dbug="+d,crash_drop_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2286,8 +2286,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_6"; -SET SESSION debug="+d,crash_drop_partition_7"; +SET SESSION debug_dbug="-d,crash_drop_partition_6"; +SET SESSION debug_dbug="+d,crash_drop_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2344,8 +2344,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_7"; -SET SESSION debug="+d,crash_drop_partition_8"; +SET SESSION debug_dbug="-d,crash_drop_partition_7"; +SET SESSION debug_dbug="+d,crash_drop_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2401,8 +2401,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_8"; -SET SESSION debug="+d,crash_drop_partition_9"; +SET SESSION debug_dbug="-d,crash_drop_partition_8"; +SET SESSION debug_dbug="+d,crash_drop_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2458,9 +2458,9 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_9"; +SET SESSION debug_dbug="-d,crash_drop_partition_9"; # Error recovery DROP PARTITION -SET SESSION debug="+d,fail_drop_partition_1"; +SET SESSION debug_dbug="+d,fail_drop_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2578,8 +2578,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_1"; -SET SESSION debug="+d,fail_drop_partition_2"; +SET SESSION debug_dbug="-d,fail_drop_partition_1"; +SET SESSION debug_dbug="+d,fail_drop_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2697,8 +2697,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_2"; -SET SESSION debug="+d,fail_drop_partition_3"; +SET SESSION debug_dbug="-d,fail_drop_partition_2"; +SET SESSION debug_dbug="+d,fail_drop_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2816,8 +2816,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_3"; -SET SESSION debug="+d,fail_drop_partition_4"; +SET SESSION debug_dbug="-d,fail_drop_partition_3"; +SET SESSION debug_dbug="+d,fail_drop_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2923,8 +2923,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_4"; -SET SESSION debug="+d,fail_drop_partition_5"; +SET SESSION debug_dbug="-d,fail_drop_partition_4"; +SET SESSION debug_dbug="+d,fail_drop_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3030,8 +3030,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_5"; -SET SESSION debug="+d,fail_drop_partition_6"; +SET SESSION debug_dbug="-d,fail_drop_partition_5"; +SET SESSION debug_dbug="+d,fail_drop_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3137,8 +3137,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_6"; -SET SESSION debug="+d,fail_drop_partition_7"; +SET SESSION debug_dbug="-d,fail_drop_partition_6"; +SET SESSION debug_dbug="+d,fail_drop_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3244,8 +3244,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_7"; -SET SESSION debug="+d,fail_drop_partition_8"; +SET SESSION debug_dbug="-d,fail_drop_partition_7"; +SET SESSION debug_dbug="+d,fail_drop_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3351,8 +3351,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_8"; -SET SESSION debug="+d,fail_drop_partition_9"; +SET SESSION debug_dbug="-d,fail_drop_partition_8"; +SET SESSION debug_dbug="+d,fail_drop_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3458,10 +3458,10 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_9"; +SET SESSION debug_dbug="-d,fail_drop_partition_9"; # Test change partition (REORGANIZE/REBUILD/COALESCE # or ADD HASH PARTITION). -SET SESSION debug="+d,crash_change_partition_1"; +SET SESSION debug_dbug="+d,crash_change_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3526,8 +3526,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_1"; -SET SESSION debug="+d,crash_change_partition_2"; +SET SESSION debug_dbug="-d,crash_change_partition_1"; +SET SESSION debug_dbug="+d,crash_change_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3594,8 +3594,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_2"; -SET SESSION debug="+d,crash_change_partition_3"; +SET SESSION debug_dbug="-d,crash_change_partition_2"; +SET SESSION debug_dbug="+d,crash_change_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3662,8 +3662,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_3"; -SET SESSION debug="+d,crash_change_partition_4"; +SET SESSION debug_dbug="-d,crash_change_partition_3"; +SET SESSION debug_dbug="+d,crash_change_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3732,8 +3732,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_4"; -SET SESSION debug="+d,crash_change_partition_5"; +SET SESSION debug_dbug="-d,crash_change_partition_4"; +SET SESSION debug_dbug="+d,crash_change_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3802,8 +3802,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_5"; -SET SESSION debug="+d,crash_change_partition_6"; +SET SESSION debug_dbug="-d,crash_change_partition_5"; +SET SESSION debug_dbug="+d,crash_change_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3874,8 +3874,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_6"; -SET SESSION debug="+d,crash_change_partition_7"; +SET SESSION debug_dbug="-d,crash_change_partition_6"; +SET SESSION debug_dbug="+d,crash_change_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3946,8 +3946,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_7"; -SET SESSION debug="+d,crash_change_partition_8"; +SET SESSION debug_dbug="-d,crash_change_partition_7"; +SET SESSION debug_dbug="+d,crash_change_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4016,8 +4016,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_8"; -SET SESSION debug="+d,crash_change_partition_9"; +SET SESSION debug_dbug="-d,crash_change_partition_8"; +SET SESSION debug_dbug="+d,crash_change_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4086,8 +4086,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_9"; -SET SESSION debug="+d,crash_change_partition_10"; +SET SESSION debug_dbug="-d,crash_change_partition_9"; +SET SESSION debug_dbug="+d,crash_change_partition_10"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4156,8 +4156,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_10"; -SET SESSION debug="+d,crash_change_partition_11"; +SET SESSION debug_dbug="-d,crash_change_partition_10"; +SET SESSION debug_dbug="+d,crash_change_partition_11"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4225,8 +4225,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_11"; -SET SESSION debug="+d,crash_change_partition_12"; +SET SESSION debug_dbug="-d,crash_change_partition_11"; +SET SESSION debug_dbug="+d,crash_change_partition_12"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4294,10 +4294,10 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_12"; +SET SESSION debug_dbug="-d,crash_change_partition_12"; # Error recovery change partition (REORGANIZE/REBUILD/COALESCE # or ADD HASH PARTITION). -SET SESSION debug="+d,fail_change_partition_1"; +SET SESSION debug_dbug="+d,fail_change_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4419,8 +4419,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_1"; -SET SESSION debug="+d,fail_change_partition_2"; +SET SESSION debug_dbug="-d,fail_change_partition_1"; +SET SESSION debug_dbug="+d,fail_change_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4542,8 +4542,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_2"; -SET SESSION debug="+d,fail_change_partition_3"; +SET SESSION debug_dbug="-d,fail_change_partition_2"; +SET SESSION debug_dbug="+d,fail_change_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4665,8 +4665,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_3"; -SET SESSION debug="+d,fail_change_partition_4"; +SET SESSION debug_dbug="-d,fail_change_partition_3"; +SET SESSION debug_dbug="+d,fail_change_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4788,8 +4788,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_4"; -SET SESSION debug="+d,fail_change_partition_5"; +SET SESSION debug_dbug="-d,fail_change_partition_4"; +SET SESSION debug_dbug="+d,fail_change_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4911,8 +4911,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_5"; -SET SESSION debug="+d,fail_change_partition_6"; +SET SESSION debug_dbug="-d,fail_change_partition_5"; +SET SESSION debug_dbug="+d,fail_change_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -5038,8 +5038,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_6"; -SET SESSION debug="+d,fail_change_partition_7"; +SET SESSION debug_dbug="-d,fail_change_partition_6"; +SET SESSION debug_dbug="+d,fail_change_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -5165,8 +5165,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_7"; -SET SESSION debug="+d,fail_change_partition_8"; +SET SESSION debug_dbug="-d,fail_change_partition_7"; +SET SESSION debug_dbug="+d,fail_change_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -5292,8 +5292,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_8"; -SET SESSION debug="+d,fail_change_partition_9"; +SET SESSION debug_dbug="-d,fail_change_partition_8"; +SET SESSION debug_dbug="+d,fail_change_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -5419,8 +5419,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_9"; -SET SESSION debug="+d,fail_change_partition_10"; +SET SESSION debug_dbug="-d,fail_change_partition_9"; +SET SESSION debug_dbug="+d,fail_change_partition_10"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -5546,8 +5546,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_10"; -SET SESSION debug="+d,fail_change_partition_11"; +SET SESSION debug_dbug="-d,fail_change_partition_10"; +SET SESSION debug_dbug="+d,fail_change_partition_11"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -5673,8 +5673,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_11"; -SET SESSION debug="+d,fail_change_partition_12"; +SET SESSION debug_dbug="-d,fail_change_partition_11"; +SET SESSION debug_dbug="+d,fail_change_partition_12"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -5800,4 +5800,4 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_12"; +SET SESSION debug_dbug="-d,fail_change_partition_12"; diff --git a/mysql-test/suite/parts/r/partition_debug_myisam.result b/mysql-test/suite/parts/r/partition_debug_myisam.result index ca3dd708972..ebd470ad6e1 100644 --- a/mysql-test/suite/parts/r/partition_debug_myisam.result +++ b/mysql-test/suite/parts/r/partition_debug_myisam.result @@ -8,7 +8,7 @@ DROP TABLE IF EXISTS t1; # Extended crash recovery testing of fast_alter_partition_table. call mtr.add_suppression("Attempting backtrace. You can use the following information to find out"); # Crash testing ADD PARTITION -SET SESSION debug="+d,crash_add_partition_1"; +SET SESSION debug_dbug="+d,crash_add_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -78,8 +78,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_1"; -SET SESSION debug="+d,crash_add_partition_2"; +SET SESSION debug_dbug="-d,crash_add_partition_1"; +SET SESSION debug_dbug="+d,crash_add_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -151,8 +151,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_2"; -SET SESSION debug="+d,crash_add_partition_3"; +SET SESSION debug_dbug="-d,crash_add_partition_2"; +SET SESSION debug_dbug="+d,crash_add_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -224,8 +224,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_3"; -SET SESSION debug="+d,crash_add_partition_4"; +SET SESSION debug_dbug="-d,crash_add_partition_3"; +SET SESSION debug_dbug="+d,crash_add_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -297,8 +297,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_4"; -SET SESSION debug="+d,crash_add_partition_5"; +SET SESSION debug_dbug="-d,crash_add_partition_4"; +SET SESSION debug_dbug="+d,crash_add_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -372,8 +372,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_5"; -SET SESSION debug="+d,crash_add_partition_6"; +SET SESSION debug_dbug="-d,crash_add_partition_5"; +SET SESSION debug_dbug="+d,crash_add_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -447,8 +447,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_6"; -SET SESSION debug="+d,crash_add_partition_7"; +SET SESSION debug_dbug="-d,crash_add_partition_6"; +SET SESSION debug_dbug="+d,crash_add_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -522,8 +522,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_7"; -SET SESSION debug="+d,crash_add_partition_8"; +SET SESSION debug_dbug="-d,crash_add_partition_7"; +SET SESSION debug_dbug="+d,crash_add_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -600,8 +600,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_8"; -SET SESSION debug="+d,crash_add_partition_9"; +SET SESSION debug_dbug="-d,crash_add_partition_8"; +SET SESSION debug_dbug="+d,crash_add_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -676,8 +676,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_9"; -SET SESSION debug="+d,crash_add_partition_10"; +SET SESSION debug_dbug="-d,crash_add_partition_9"; +SET SESSION debug_dbug="+d,crash_add_partition_10"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -752,9 +752,9 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_10"; +SET SESSION debug_dbug="-d,crash_add_partition_10"; # Error recovery testing ADD PARTITION -SET SESSION debug="+d,fail_add_partition_1"; +SET SESSION debug_dbug="+d,fail_add_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -882,8 +882,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_1"; -SET SESSION debug="+d,fail_add_partition_2"; +SET SESSION debug_dbug="-d,fail_add_partition_1"; +SET SESSION debug_dbug="+d,fail_add_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -1011,8 +1011,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_2"; -SET SESSION debug="+d,fail_add_partition_3"; +SET SESSION debug_dbug="-d,fail_add_partition_2"; +SET SESSION debug_dbug="+d,fail_add_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -1140,8 +1140,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_3"; -SET SESSION debug="+d,fail_add_partition_4"; +SET SESSION debug_dbug="-d,fail_add_partition_3"; +SET SESSION debug_dbug="+d,fail_add_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -1269,8 +1269,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_4"; -SET SESSION debug="+d,fail_add_partition_5"; +SET SESSION debug_dbug="-d,fail_add_partition_4"; +SET SESSION debug_dbug="+d,fail_add_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -1398,8 +1398,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_5"; -SET SESSION debug="+d,fail_add_partition_6"; +SET SESSION debug_dbug="-d,fail_add_partition_5"; +SET SESSION debug_dbug="+d,fail_add_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -1527,8 +1527,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_6"; -SET SESSION debug="+d,fail_add_partition_7"; +SET SESSION debug_dbug="-d,fail_add_partition_6"; +SET SESSION debug_dbug="+d,fail_add_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -1656,8 +1656,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_7"; -SET SESSION debug="+d,fail_add_partition_8"; +SET SESSION debug_dbug="-d,fail_add_partition_7"; +SET SESSION debug_dbug="+d,fail_add_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -1791,8 +1791,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_8"; -SET SESSION debug="+d,fail_add_partition_9"; +SET SESSION debug_dbug="-d,fail_add_partition_8"; +SET SESSION debug_dbug="+d,fail_add_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -1926,8 +1926,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_9"; -SET SESSION debug="+d,fail_add_partition_10"; +SET SESSION debug_dbug="-d,fail_add_partition_9"; +SET SESSION debug_dbug="+d,fail_add_partition_10"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2061,9 +2061,9 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_10"; +SET SESSION debug_dbug="-d,fail_add_partition_10"; # Test DROP PARTITION -SET SESSION debug="+d,crash_drop_partition_1"; +SET SESSION debug_dbug="+d,crash_drop_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2132,8 +2132,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_1"; -SET SESSION debug="+d,crash_drop_partition_2"; +SET SESSION debug_dbug="-d,crash_drop_partition_1"; +SET SESSION debug_dbug="+d,crash_drop_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2204,8 +2204,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_2"; -SET SESSION debug="+d,crash_drop_partition_3"; +SET SESSION debug_dbug="-d,crash_drop_partition_2"; +SET SESSION debug_dbug="+d,crash_drop_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2276,8 +2276,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_3"; -SET SESSION debug="+d,crash_drop_partition_4"; +SET SESSION debug_dbug="-d,crash_drop_partition_3"; +SET SESSION debug_dbug="+d,crash_drop_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2341,8 +2341,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_4"; -SET SESSION debug="+d,crash_drop_partition_5"; +SET SESSION debug_dbug="-d,crash_drop_partition_4"; +SET SESSION debug_dbug="+d,crash_drop_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2406,8 +2406,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_5"; -SET SESSION debug="+d,crash_drop_partition_6"; +SET SESSION debug_dbug="-d,crash_drop_partition_5"; +SET SESSION debug_dbug="+d,crash_drop_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2471,8 +2471,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_6"; -SET SESSION debug="+d,crash_drop_partition_7"; +SET SESSION debug_dbug="-d,crash_drop_partition_6"; +SET SESSION debug_dbug="+d,crash_drop_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2534,8 +2534,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_7"; -SET SESSION debug="+d,crash_drop_partition_8"; +SET SESSION debug_dbug="-d,crash_drop_partition_7"; +SET SESSION debug_dbug="+d,crash_drop_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2595,8 +2595,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_8"; -SET SESSION debug="+d,crash_drop_partition_9"; +SET SESSION debug_dbug="-d,crash_drop_partition_8"; +SET SESSION debug_dbug="+d,crash_drop_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2656,9 +2656,9 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_9"; +SET SESSION debug_dbug="-d,crash_drop_partition_9"; # Error recovery DROP PARTITION -SET SESSION debug="+d,fail_drop_partition_1"; +SET SESSION debug_dbug="+d,fail_drop_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2784,8 +2784,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_1"; -SET SESSION debug="+d,fail_drop_partition_2"; +SET SESSION debug_dbug="-d,fail_drop_partition_1"; +SET SESSION debug_dbug="+d,fail_drop_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2911,8 +2911,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_2"; -SET SESSION debug="+d,fail_drop_partition_3"; +SET SESSION debug_dbug="-d,fail_drop_partition_2"; +SET SESSION debug_dbug="+d,fail_drop_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3038,8 +3038,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_3"; -SET SESSION debug="+d,fail_drop_partition_4"; +SET SESSION debug_dbug="-d,fail_drop_partition_3"; +SET SESSION debug_dbug="+d,fail_drop_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3151,8 +3151,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_4"; -SET SESSION debug="+d,fail_drop_partition_5"; +SET SESSION debug_dbug="-d,fail_drop_partition_4"; +SET SESSION debug_dbug="+d,fail_drop_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3264,8 +3264,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_5"; -SET SESSION debug="+d,fail_drop_partition_6"; +SET SESSION debug_dbug="-d,fail_drop_partition_5"; +SET SESSION debug_dbug="+d,fail_drop_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3377,8 +3377,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_6"; -SET SESSION debug="+d,fail_drop_partition_7"; +SET SESSION debug_dbug="-d,fail_drop_partition_6"; +SET SESSION debug_dbug="+d,fail_drop_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3490,8 +3490,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_7"; -SET SESSION debug="+d,fail_drop_partition_8"; +SET SESSION debug_dbug="-d,fail_drop_partition_7"; +SET SESSION debug_dbug="+d,fail_drop_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3603,8 +3603,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_8"; -SET SESSION debug="+d,fail_drop_partition_9"; +SET SESSION debug_dbug="-d,fail_drop_partition_8"; +SET SESSION debug_dbug="+d,fail_drop_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3716,10 +3716,10 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_9"; +SET SESSION debug_dbug="-d,fail_drop_partition_9"; # Test change partition (REORGANIZE/REBUILD/COALESCE # or ADD HASH PARTITION). -SET SESSION debug="+d,crash_change_partition_1"; +SET SESSION debug_dbug="+d,crash_change_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3790,8 +3790,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_1"; -SET SESSION debug="+d,crash_change_partition_2"; +SET SESSION debug_dbug="-d,crash_change_partition_1"; +SET SESSION debug_dbug="+d,crash_change_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3864,8 +3864,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_2"; -SET SESSION debug="+d,crash_change_partition_3"; +SET SESSION debug_dbug="-d,crash_change_partition_2"; +SET SESSION debug_dbug="+d,crash_change_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3938,8 +3938,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_3"; -SET SESSION debug="+d,crash_change_partition_4"; +SET SESSION debug_dbug="-d,crash_change_partition_3"; +SET SESSION debug_dbug="+d,crash_change_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4016,8 +4016,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_4"; -SET SESSION debug="+d,crash_change_partition_5"; +SET SESSION debug_dbug="-d,crash_change_partition_4"; +SET SESSION debug_dbug="+d,crash_change_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4094,8 +4094,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_5"; -SET SESSION debug="+d,crash_change_partition_6"; +SET SESSION debug_dbug="-d,crash_change_partition_5"; +SET SESSION debug_dbug="+d,crash_change_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4175,8 +4175,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_6"; -SET SESSION debug="+d,crash_change_partition_7"; +SET SESSION debug_dbug="-d,crash_change_partition_6"; +SET SESSION debug_dbug="+d,crash_change_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4256,8 +4256,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_7"; -SET SESSION debug="+d,crash_change_partition_8"; +SET SESSION debug_dbug="-d,crash_change_partition_7"; +SET SESSION debug_dbug="+d,crash_change_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4335,8 +4335,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_8"; -SET SESSION debug="+d,crash_change_partition_9"; +SET SESSION debug_dbug="-d,crash_change_partition_8"; +SET SESSION debug_dbug="+d,crash_change_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4414,8 +4414,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_9"; -SET SESSION debug="+d,crash_change_partition_10"; +SET SESSION debug_dbug="-d,crash_change_partition_9"; +SET SESSION debug_dbug="+d,crash_change_partition_10"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4493,8 +4493,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_10"; -SET SESSION debug="+d,crash_change_partition_11"; +SET SESSION debug_dbug="-d,crash_change_partition_10"; +SET SESSION debug_dbug="+d,crash_change_partition_11"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4570,8 +4570,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_11"; -SET SESSION debug="+d,crash_change_partition_12"; +SET SESSION debug_dbug="-d,crash_change_partition_11"; +SET SESSION debug_dbug="+d,crash_change_partition_12"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4647,10 +4647,10 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_12"; +SET SESSION debug_dbug="-d,crash_change_partition_12"; # Error recovery change partition (REORGANIZE/REBUILD/COALESCE # or ADD HASH PARTITION). -SET SESSION debug="+d,fail_change_partition_1"; +SET SESSION debug_dbug="+d,fail_change_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4780,8 +4780,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_1"; -SET SESSION debug="+d,fail_change_partition_2"; +SET SESSION debug_dbug="-d,fail_change_partition_1"; +SET SESSION debug_dbug="+d,fail_change_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4911,8 +4911,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_2"; -SET SESSION debug="+d,fail_change_partition_3"; +SET SESSION debug_dbug="-d,fail_change_partition_2"; +SET SESSION debug_dbug="+d,fail_change_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -5042,8 +5042,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_3"; -SET SESSION debug="+d,fail_change_partition_4"; +SET SESSION debug_dbug="-d,fail_change_partition_3"; +SET SESSION debug_dbug="+d,fail_change_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -5173,8 +5173,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_4"; -SET SESSION debug="+d,fail_change_partition_5"; +SET SESSION debug_dbug="-d,fail_change_partition_4"; +SET SESSION debug_dbug="+d,fail_change_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -5304,8 +5304,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_5"; -SET SESSION debug="+d,fail_change_partition_6"; +SET SESSION debug_dbug="-d,fail_change_partition_5"; +SET SESSION debug_dbug="+d,fail_change_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -5441,8 +5441,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_6"; -SET SESSION debug="+d,fail_change_partition_7"; +SET SESSION debug_dbug="-d,fail_change_partition_6"; +SET SESSION debug_dbug="+d,fail_change_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -5578,8 +5578,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_7"; -SET SESSION debug="+d,fail_change_partition_8"; +SET SESSION debug_dbug="-d,fail_change_partition_7"; +SET SESSION debug_dbug="+d,fail_change_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -5715,8 +5715,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_8"; -SET SESSION debug="+d,fail_change_partition_9"; +SET SESSION debug_dbug="-d,fail_change_partition_8"; +SET SESSION debug_dbug="+d,fail_change_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -5852,8 +5852,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_9"; -SET SESSION debug="+d,fail_change_partition_10"; +SET SESSION debug_dbug="-d,fail_change_partition_9"; +SET SESSION debug_dbug="+d,fail_change_partition_10"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -5989,8 +5989,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_10"; -SET SESSION debug="+d,fail_change_partition_11"; +SET SESSION debug_dbug="-d,fail_change_partition_10"; +SET SESSION debug_dbug="+d,fail_change_partition_11"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -6126,8 +6126,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_11"; -SET SESSION debug="+d,fail_change_partition_12"; +SET SESSION debug_dbug="-d,fail_change_partition_11"; +SET SESSION debug_dbug="+d,fail_change_partition_12"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -6263,4 +6263,4 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_12"; +SET SESSION debug_dbug="-d,fail_change_partition_12"; diff --git a/mysql-test/suite/pbxt/r/mysqlshow.result b/mysql-test/suite/pbxt/r/mysqlshow.result index b378b972410..a8bd5904600 100644 --- 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_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 +---------------------------------------+ @@ -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_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/suite/rpl/r/rpl_binlog_errors.result b/mysql-test/suite/rpl/r/rpl_binlog_errors.result index d965686a34f..ddafbca0672 100644 --- 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=@old_debug; +SET GLOBAL debug_dbug="-d,error_unique_log_filename"; +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=@old_debug; +SET GLOBAL debug_dbug="-d,fault_injection_new_file_rotate_event"; +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=@old_debug; +SET GLOBAL debug_dbug="-d,fault_injection_registering_index"; +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=@old_debug; +SET GLOBAL debug_dbug="-d,fault_injection_openning_index"; +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 diff --git a/mysql-test/suite/rpl/r/rpl_bug26395.result b/mysql-test/suite/rpl/r/rpl_bug26395.result index a3725f34a55..37ad6705106 100644 --- 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 diff --git a/mysql-test/suite/rpl/r/rpl_bug33931.result b/mysql-test/suite/rpl/r/rpl_bug33931.result index ce8b6b169c7..e72b966ef6a 100644 --- 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 diff --git a/mysql-test/suite/rpl/r/rpl_bug41902.result b/mysql-test/suite/rpl/r/rpl_bug41902.result index 5331d4334fa..026a92d854b 100644 --- a/mysql-test/suite/rpl/r/rpl_bug41902.result +++ b/mysql-test/suite/rpl/r/rpl_bug41902.result @@ -1,31 +1,31 @@ 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'; diff --git a/mysql-test/suite/rpl/r/rpl_checksum.result b/mysql-test/suite/rpl/r/rpl_checksum.result index b6b1210f05f..3297e8c2754 100644 --- 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 diff --git a/mysql-test/suite/rpl/r/rpl_corruption.result b/mysql-test/suite/rpl/r/rpl_corruption.result index a35bfbad92c..32ed3077c23 100644 --- 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= ""; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event2"; +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= ""; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event_char"; +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 diff --git a/mysql-test/suite/rpl/r/rpl_init_slave_errors.result b/mysql-test/suite/rpl/r/rpl_init_slave_errors.result index a185afc5af2..57c0bb129fa 100644 --- 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; diff --git a/mysql-test/suite/rpl/r/rpl_row_corruption.result b/mysql-test/suite/rpl/r/rpl_row_corruption.result index 7fd47a20f03..da4a1d17727 100644 --- 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 diff --git a/mysql-test/suite/rpl/r/rpl_row_index_choice.result b/mysql-test/suite/rpl/r/rpl_row_index_choice.result index 2d955299e6e..a1d3c2d2c93 100644 --- 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 diff --git a/mysql-test/suite/rpl/r/rpl_show_slave_running.result b/mysql-test/suite/rpl/r/rpl_show_slave_running.result index 599290ac776..3e5e1882bd8 100644 --- 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 diff --git a/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result b/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result index e08c066d226..0abae0bff28 100644 --- a/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result +++ b/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result @@ -1,6 +1,6 @@ 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 diff --git a/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result b/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result index 0b3233437aa..e72d8a53a42 100644 --- 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="+d,incomplete_group_in_relay_log"; +set @@global.debug_dbug="+d,stop_slave_middle_group"; +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="+d,incomplete_group_in_relay_log"; +set @@global.debug_dbug="+d,stop_slave_middle_group"; +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 diff --git a/mysql-test/suite/rpl/r/rpl_stop_slave.result b/mysql-test/suite/rpl/r/rpl_stop_slave.result index 4a802432234..1d108230f0e 100644 --- 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 diff --git a/mysql-test/suite/rpl/r/rpl_sync.result b/mysql-test/suite/rpl/r/rpl_sync.result index de3506465aa..3d61fcb80cc 100644 --- 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 diff --git a/mysql-test/suite/rpl/t/rpl_binlog_errors.test b/mysql-test/suite/rpl/t/rpl_binlog_errors.test index 1b05e24c94e..9e4a106a5b5 100644 --- 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 diff --git a/mysql-test/suite/rpl/t/rpl_bug26395.test b/mysql-test/suite/rpl/t/rpl_bug26395.test index aeb0da9511d..9f45db85fb7 100644 --- 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; diff --git a/mysql-test/suite/rpl/t/rpl_bug33931.test b/mysql-test/suite/rpl/t/rpl_bug33931.test index 5cc2da4a001..2273219a821 100644 --- 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; diff --git a/mysql-test/suite/rpl/t/rpl_bug38694-slave.opt b/mysql-test/suite/rpl/t/rpl_bug38694-slave.opt index d96e981b198..b457a7ebd4a 100644 --- a/mysql-test/suite/rpl/t/rpl_bug38694-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_bug38694-slave.opt @@ -1 +1 @@ ---loose-debug=d,simulate_slave_delay_at_terminate_bug38694 +--loose-debug-dbug=d,simulate_slave_delay_at_terminate_bug38694 diff --git a/mysql-test/suite/rpl/t/rpl_bug41902.test b/mysql-test/suite/rpl/t/rpl_bug41902.test index 12eeb903003..ad9f8d16fb3 100644 --- a/mysql-test/suite/rpl/t/rpl_bug41902.test +++ b/mysql-test/suite/rpl/t/rpl_bug41902.test @@ -16,38 +16,38 @@ source include/master-slave.inc; connection slave; stop slave; -SET @@debug="d,simulate_find_log_pos_error"; +SET @@debug_dbug="d,simulate_find_log_pos_error"; --error ER_UNKNOWN_TARGET_BINLOG reset slave; show warnings; -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"; --error ER_UNKNOWN_TARGET_BINLOG change master to master_host='dummy'; -SET @@debug=""; +SET @@debug_dbug=""; reset slave; change master to master_host='dummy'; connection master; -SET @@debug="d,simulate_find_log_pos_error"; +SET @@debug_dbug="d,simulate_find_log_pos_error"; --error ER_UNKNOWN_TARGET_BINLOG reset master; -SET @@debug=""; +SET @@debug_dbug=""; reset master; -SET @@debug="d,simulate_find_log_pos_error"; +SET @@debug_dbug="d,simulate_find_log_pos_error"; --error ER_UNKNOWN_TARGET_BINLOG purge binary logs to 'master-bin.000001'; -SET @@debug=""; +SET @@debug_dbug=""; purge binary logs to 'master-bin.000001'; --disable_query_log diff --git a/mysql-test/suite/rpl/t/rpl_checksum.test b/mysql-test/suite/rpl/t/rpl_checksum.test index 237fffaf33e..68f8f41f755 100644 --- a/mysql-test/suite/rpl/t/rpl_checksum.test +++ b/mysql-test/suite/rpl/t/rpl_checksum.test @@ -100,7 +100,7 @@ insert into t1 values (1) /* will not be applied on slave due to simulation */; # instruction to the dump thread connection slave; -set @@global.debug='d,simulate_slave_unaware_checksum'; +set @@global.debug_dbug='d,simulate_slave_unaware_checksum'; start slave; --let $slave_io_errno= 1236 --let $show_slave_io_error= 1 @@ -109,7 +109,7 @@ source include/wait_for_slave_io_error.inc; select count(*) as zero from t1; ###connection master; -set @@global.debug=''; +set @@global.debug_dbug=''; connection slave; source include/start_slave.inc; @@ -121,10 +121,10 @@ source include/start_slave.inc; # C1. Failure by a client thread connection master; set @@global.master_verify_checksum = 1; -set @@session.debug='d,simulate_checksum_test_failure'; +set @@session.debug_dbug='d,simulate_checksum_test_failure'; --error ER_ERROR_WHEN_EXECUTING_COMMAND show binlog events; -set @@session.debug=''; +set @@session.debug_dbug=''; set @@global.master_verify_checksum = default; #connection master; @@ -141,12 +141,12 @@ connection slave; # C2. Failure by IO thread # instruction to io thread -set @@global.debug='d,simulate_checksum_test_failure'; +set @@global.debug_dbug='d,simulate_checksum_test_failure'; start slave io_thread; --let $slave_io_errno= 1595 --let $show_slave_io_error= 1 source include/wait_for_slave_io_error.inc; -set @@global.debug=''; +set @@global.debug_dbug=''; # to make IO thread re-read it again w/o the failure start slave io_thread; @@ -158,7 +158,7 @@ source include/wait_for_slave_param.inc; # instruction to sql thread; 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; --let $slave_sql_errno= 1593 @@ -167,7 +167,7 @@ source include/wait_for_slave_sql_error.inc; # resuming SQL thread to parse out the event w/o the failure -set @@global.debug=''; +set @@global.debug_dbug=''; source include/start_slave.inc; connection master; diff --git a/mysql-test/suite/rpl/t/rpl_corruption.test b/mysql-test/suite/rpl/t/rpl_corruption.test index a46325bf1f4..70322197317 100644 --- a/mysql-test/suite/rpl/t/rpl_corruption.test +++ b/mysql-test/suite/rpl/t/rpl_corruption.test @@ -67,7 +67,7 @@ while ($i) { # Emulate corruption in binlog file when SHOW BINLOG EVENTS is executing --echo # 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"; --echo SHOW BINLOG EVENTS; --disable_query_log send_eval SHOW BINLOG EVENTS FROM $pos; @@ -75,7 +75,7 @@ send_eval SHOW BINLOG EVENTS FROM $pos; --error ER_ERROR_WHEN_EXECUTING_COMMAND reap; -SET GLOBAL debug="-d,corrupt_read_log_event_char"; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event_char"; # Emulate corruption on master with crc checking on master --echo # 3. Master read a corrupted event from binlog and send the error to slave @@ -100,48 +100,48 @@ let $wait_condition= SELECT COUNT(*)=0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE command = 'Binlog Dump'; --source include/wait_condition.inc -SET GLOBAL debug="+d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="+d,corrupt_read_log_event2"; --connection slave START SLAVE IO_THREAD; let $slave_io_errno= 1236; --source include/wait_for_slave_io_error.inc --connection master -SET GLOBAL debug="-d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event2"; # Emulate corruption on master without crc checking on master --echo # 4. Master read a corrupted event from binlog and send it to slave --connection master SET GLOBAL master_verify_checksum=0; -SET GLOBAL debug="+d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="+d,corrupt_read_log_event2"; --connection slave START SLAVE IO_THREAD; let $slave_io_errno= 1595,1722; --source include/wait_for_slave_io_error.inc --connection master -SET GLOBAL debug="-d,corrupt_read_log_event2"; -SET GLOBAL debug= ""; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug= ""; SET GLOBAL master_verify_checksum=1; # Emulate corruption in network --echo # 5. Slave. Corruption in network --connection slave -SET GLOBAL debug="+d,corrupt_queue_event"; +SET GLOBAL debug_dbug="+d,corrupt_queue_event"; START SLAVE IO_THREAD; let $slave_io_errno= 1595,1722; --source include/wait_for_slave_io_error.inc -SET GLOBAL debug="-d,corrupt_queue_event"; +SET GLOBAL debug_dbug="-d,corrupt_queue_event"; # Emulate corruption in relay log --echo # 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; let $slave_sql_errno= 1593; --source include/wait_for_slave_sql_error.inc -SET GLOBAL debug="-d,corrupt_read_log_event_char"; -SET GLOBAL debug= ""; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event_char"; +SET GLOBAL debug_dbug= ""; # Start normal replication and compare same table on master # and slave @@ -156,10 +156,10 @@ let $diff_tables= master:test.t1, slave:test.t1; # Clean up --echo # 8. Clean up --connection master -SET GLOBAL debug= ""; +SET GLOBAL debug_dbug= ""; SET GLOBAL master_verify_checksum = @old_master_verify_checksum; DROP TABLE t1; --sync_slave_with_master -SET GLOBAL debug= ""; +SET GLOBAL debug_dbug= ""; --source include/rpl_end.inc diff --git 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 index 01247fefd64..17417a55b8c 100644 --- 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 @@ -40,7 +40,7 @@ let $dbug_sync_point= 'debug_lock.before_get_SERVER_ID'; let $debug_sync_action= 'now SIGNAL signal.get_server_id'; source extra/rpl_tests/rpl_get_master_version_and_clock.test; -eval set global debug= '$debug_saved'; +eval set global debug_dbug= '$debug_saved'; # cleanup diff --git a/mysql-test/suite/rpl/t/rpl_init_slave_errors.test b/mysql-test/suite/rpl/t/rpl_init_slave_errors.test index 4dab13856d4..067d21a4e46 100644 --- a/mysql-test/suite/rpl/t/rpl_init_slave_errors.test +++ b/mysql-test/suite/rpl/t/rpl_init_slave_errors.test @@ -45,7 +45,7 @@ reset slave; connection 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"; start slave; @@ -60,7 +60,7 @@ start slave; call mtr.add_suppression("Failed during slave.* thread initialization"); -SET GLOBAL debug= ""; +SET GLOBAL debug_dbug= ""; ###################################################################### # Injecting faults in the init_slave option diff --git a/mysql-test/suite/rpl/t/rpl_killed_ddl-master.opt b/mysql-test/suite/rpl/t/rpl_killed_ddl-master.opt index aaf2d8a4251..dcc136e192f 100644 --- a/mysql-test/suite/rpl/t/rpl_killed_ddl-master.opt +++ b/mysql-test/suite/rpl/t/rpl_killed_ddl-master.opt @@ -1 +1 @@ ---debug=d,debug_lock_before_query_log_event +--loose-debug-dbug=d,debug_lock_before_query_log_event diff --git a/mysql-test/suite/rpl/t/rpl_row_corruption.test b/mysql-test/suite/rpl/t/rpl_row_corruption.test index a7650c615a3..e05273a2f9c 100644 --- a/mysql-test/suite/rpl/t/rpl_row_corruption.test +++ b/mysql-test/suite/rpl/t/rpl_row_corruption.test @@ -28,7 +28,7 @@ call mtr.add_suppression(".*Found table map event mapping table id 0 which was a # stop the slave and inject corruption --source 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"; --source include/start_slave.inc --connection master # both tables get mapped to 0 (in a way, simulating scenario @@ -42,7 +42,7 @@ SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table"; --source include/stop_slave.inc # clean up -SET GLOBAL debug="-d,inject_tblmap_same_id_maps_diff_table"; +SET GLOBAL debug_dbug="-d,inject_tblmap_same_id_maps_diff_table"; --source include/start_slave.inc --connection master --source include/rpl_reset.inc @@ -55,7 +55,7 @@ SET GLOBAL debug="-d,inject_tblmap_same_id_maps_diff_table"; --connection slave --source 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"; --source include/start_slave.inc --source include/rpl_reset.inc --connection master @@ -92,7 +92,7 @@ AAAAAAAAAAAAAAAAAABI6BZOEzgNAAgAEgAEBAQEEgAAVgAEGggAAAAICAgCAAAAAAVAYI8= #110708 12:21:44 server id 1 end_log_pos 855 Update_rows: table id 66 # at 855 #110708 12:21:44 server id 1 end_log_pos 895 Update_rows: table id 67 flags: STMT_END_F -SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table"; +SET GLOBAL debug_dbug="+d,inject_tblmap_same_id_maps_diff_table"; --error ER_SLAVE_FATAL_ERROR BINLOG ' SOgWThMBAAAAKQAAAAYDAAAAAEIAAAAAAAEABHRlc3QAAnQxAAEDAAE= @@ -105,11 +105,11 @@ SOgWThgBAAAAKAAAAH8DAAAAAEMAAAAAAAEAAf///gEAAAD+BAAAAA== # clean up DROP TABLE t1,t2; --connection slave -SET GLOBAL debug="-d,inject_tblmap_same_id_maps_diff_table"; +SET GLOBAL debug_dbug="-d,inject_tblmap_same_id_maps_diff_table"; --connection master --eval DROP TABLE $t1 --eval DROP TABLE $t2_ign --sync_slave_with_master -SET GLOBAL debug= @save_debug; +SET GLOBAL debug_dbug= @save_debug; --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_index_choice.test b/mysql-test/suite/rpl/t/rpl_row_index_choice.test index d393c65438a..6d4053f9737 100644 --- a/mysql-test/suite/rpl/t/rpl_row_index_choice.test +++ b/mysql-test/suite/rpl/t/rpl_row_index_choice.test @@ -47,7 +47,7 @@ sync_slave_with_master; connection slave; ANALYZE TABLE t2; --echo # 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"; connection master; UPDATE t2 SET d=10042 WHERE d=42; @@ -55,7 +55,7 @@ DELETE FROM t2 WHERE d=53; sync_slave_with_master; connection slave; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); # Test that we don't pick a unique index with NULLS over a more selective @@ -72,7 +72,7 @@ sync_slave_with_master; connection slave; ANALYZE TABLE t2; --echo # 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"; connection master; UPDATE t2 SET d=10042 WHERE d=42; @@ -80,7 +80,7 @@ DELETE FROM t2 WHERE d=53; sync_slave_with_master; connection slave; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); connection master; @@ -97,7 +97,7 @@ INSERT INTO t2 SELECT d DIV 10, d MOD 41, d MOD 37, d FROM t1; sync_slave_with_master; connection slave; --echo # 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"; connection master; UPDATE t2 SET d=10042 WHERE d=42; @@ -105,7 +105,7 @@ DELETE FROM t2 WHERE d=53; sync_slave_with_master; connection slave; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); connection master; @@ -125,7 +125,7 @@ INSERT INTO t2 SELECT d DIV 10, d MOD 41, d MOD 37, d FROM t1; sync_slave_with_master; connection slave; --echo # 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"; connection master; UPDATE t2 SET d=10042 WHERE d=42; @@ -133,7 +133,7 @@ DELETE FROM t2 WHERE d=53; sync_slave_with_master; connection slave; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); connection master; @@ -150,7 +150,7 @@ INSERT INTO t2 SELECT d DIV 10, d MOD 41, d MOD 37, d FROM t1; sync_slave_with_master; connection slave; --echo # 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"; connection master; UPDATE t2 SET d=10042 WHERE d=42; @@ -158,7 +158,7 @@ DELETE FROM t2 WHERE d=53; sync_slave_with_master; connection slave; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); connection master; @@ -176,7 +176,7 @@ sync_slave_with_master; connection slave; ANALYZE TABLE t2; --echo # 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"; connection master; UPDATE t2 SET d=10042 WHERE d=42; @@ -184,7 +184,7 @@ DELETE FROM t2 WHERE d=53; sync_slave_with_master; connection slave; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); connection master; @@ -204,7 +204,7 @@ INSERT INTO t2 SELECT d DIV 10, d MOD 41, d MOD 37, d, IF(d<10, d, NULL) FROM t1 sync_slave_with_master; connection slave; --echo # 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"; connection master; UPDATE t2 SET d=10042 WHERE d=42; @@ -212,7 +212,7 @@ DELETE FROM t2 WHERE d=53; sync_slave_with_master; connection slave; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); connection master; @@ -238,6 +238,6 @@ connection master; DROP TABLE t1; sync_slave_with_master; connection slave; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_show_slave_running.test b/mysql-test/suite/rpl/t/rpl_show_slave_running.test index d8c86a2aeb1..98b4a3575e8 100644 --- a/mysql-test/suite/rpl/t/rpl_show_slave_running.test +++ b/mysql-test/suite/rpl/t/rpl_show_slave_running.test @@ -12,7 +12,7 @@ connection slave; SET DEBUG_SYNC= 'RESET'; source include/stop_slave.inc; let $debug_saved= `select @@global.debug`; -set global debug= 'd,dbug.before_get_running_status_yes'; # to block due-started IO +set global debug_dbug= 'd,dbug.before_get_running_status_yes'; # to block due-started IO # Test 1. Slave is stopped @@ -77,7 +77,7 @@ echo Slave_SQL_Running= $status; connection slave; -eval set global debug= '$debug_saved'; +eval set global debug_dbug= '$debug_saved'; SET DEBUG_SYNC= 'RESET'; --echo End of tests --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test index 36327e2354a..14cf3fc00e9 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test +++ b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test @@ -29,8 +29,8 @@ ########################################################################## connection slave; ---let $old_debug= `SELECT @@GLOBAL.DEBUG` -SET @@GLOBAL.DEBUG = '+d,remove_slave_load_file_before_write'; +--let $old_debug= `SELECT @@global.debug_dbug` +SET @@global.debug_dbug= '+d,remove_slave_load_file_before_write'; connection master; @@ -74,7 +74,7 @@ call mtr.add_suppression("Slave: File.* not found.*"); call mtr.add_suppression("Slave SQL: Error .File.* not found.* Error_code: 29"); --let $rpl_only_running_threads= 1 -eval SET @@GLOBAL.DEBUG = '$old_debug'; +eval SET @@global.debug_dbug= '$old_debug'; --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_stop_slave.test b/mysql-test/suite/rpl/t/rpl_stop_slave.test index 6a1b29da676..b0eeb29bad5 100644 --- a/mysql-test/suite/rpl/t/rpl_stop_slave.test +++ b/mysql-test/suite/rpl/t/rpl_stop_slave.test @@ -23,7 +23,7 @@ source include/stop_slave.inc; --echo # It guarantees that SQL thread is applying the transaction when --echo # STOP SLAVE command launchs. let $debug_save= `SELECT @@GLOBAL.debug`; -SET GLOBAL debug= 'd,after_mysql_insert'; +SET GLOBAL debug_dbug= 'd,after_mysql_insert'; source include/start_slave.inc; --echo @@ -44,7 +44,7 @@ source extra/rpl_tests/rpl_stop_slave.test; --echo --echo # Test end -SET GLOBAL debug= '$debug_save'; +SET GLOBAL debug_dbug= '$debug_save'; source include/restart_slave_sql.inc; connection slave; @@ -76,7 +76,7 @@ sync_slave_with_master; --source include/rpl_connection_master.inc let $debug_save= `SELECT @@GLOBAL.debug`; -SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid'; +SET GLOBAL debug_dbug= 'd,dump_thread_wait_before_send_xid'; --source include/rpl_connection_slave.inc source include/restart_slave_sql.inc; @@ -116,5 +116,5 @@ source include/start_slave.inc; --source include/rpl_connection_master.inc DROP TABLE t1, t2; -SET GLOBAL debug= $debug_save; +SET GLOBAL debug_dbug= $debug_save; --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_sync.test b/mysql-test/suite/rpl/t/rpl_sync.test index e1750be0ff6..859f0465654 100644 --- a/mysql-test/suite/rpl/t/rpl_sync.test +++ b/mysql-test/suite/rpl/t/rpl_sync.test @@ -74,7 +74,7 @@ close ($file); EOF --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect -SET SESSION debug="d,crash_before_rotate_relaylog"; +SET SESSION debug_dbug="d,crash_before_rotate_relaylog"; --error 2013 FLUSH LOGS; @@ -122,7 +122,7 @@ close FILE; EOF --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect -SET SESSION debug="d,crash_before_rotate_relaylog"; +SET SESSION debug_dbug="d,crash_before_rotate_relaylog"; --error 2013 FLUSH LOGS; diff --git a/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt b/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt index b37427aa2cd..3d37b7041fb 100644 --- a/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt @@ -1,2 +1,2 @@ ---loose-debug="+d,all_errors_are_temporary_errors" --slave-transaction-retries=2 +--loose-debug-dbug="+d,all_errors_are_temporary_errors" --slave-transaction-retries=2 --force-restart diff --git a/mysql-test/suite/sys_vars/r/debug_basic.result b/mysql-test/suite/sys_vars/r/debug_basic.result index 5a77446d036..1ab970ad24f 100644 --- a/mysql-test/suite/sys_vars/r/debug_basic.result +++ b/mysql-test/suite/sys_vars/r/debug_basic.result @@ -1,4 +1,6 @@ set session debug="L"; +Warnings: +Warning 1287 The syntax '@@debug' is deprecated and will be removed in MariaDB 5.6. Please use '@@debug_dbug' instead select @@global.debug="1"; @@global.debug="1" 0 diff --git a/mysql-test/suite/sys_vars/r/debug_dbug_basic.result b/mysql-test/suite/sys_vars/r/debug_dbug_basic.result new file mode 100644 index 00000000000..ad2fbc5a738 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/debug_dbug_basic.result @@ -0,0 +1,25 @@ +set session debug_dbug="L"; +select @@global.debug_dbug="1"; +@@global.debug_dbug="1" +0 +select @@session.debug; +@@session.debug +L +show global variables like 'debug'; +Variable_name Value +debug # +show session variables like 'debug'; +Variable_name Value +debug L +select * from information_schema.global_variables where variable_name="debug"; +VARIABLE_NAME VARIABLE_VALUE +DEBUG # +select * from information_schema.session_variables where variable_name="debug"; +VARIABLE_NAME VARIABLE_VALUE +DEBUG L +set @@global.debug_dbug=1; +ERROR 42000: Incorrect argument type to variable 'debug_dbug' +set @@global.debug_dbug=1.1; +ERROR 42000: Incorrect argument type to variable 'debug_dbug' +set @@global.debug_dbug=1e1; +ERROR 42000: Incorrect argument type to variable 'debug_dbug' diff --git a/mysql-test/suite/sys_vars/t/debug_dbug_basic.test b/mysql-test/suite/sys_vars/t/debug_dbug_basic.test new file mode 100644 index 00000000000..44471bf193d --- /dev/null +++ b/mysql-test/suite/sys_vars/t/debug_dbug_basic.test @@ -0,0 +1,22 @@ +--source include/have_debug.inc +# +# exists both as global and session +# +set session debug_dbug="L"; + +select @@global.debug_dbug="1"; # just to show that global.debug exists +select @@session.debug; # here we know the value and can display it +--replace_column 2 # +show global variables like 'debug'; +show session variables like 'debug'; +--replace_column 2 # +select * from information_schema.global_variables where variable_name="debug"; +select * from information_schema.session_variables where variable_name="debug"; + +--error ER_WRONG_TYPE_FOR_VAR +set @@global.debug_dbug=1; +--error ER_WRONG_TYPE_FOR_VAR +set @@global.debug_dbug=1.1; +--error ER_WRONG_TYPE_FOR_VAR +set @@global.debug_dbug=1e1; + diff --git a/mysql-test/t/alter_table-big.test b/mysql-test/t/alter_table-big.test index e007a3a55e0..cc7b8ea02b4 100644 --- a/mysql-test/t/alter_table-big.test +++ b/mysql-test/t/alter_table-big.test @@ -38,7 +38,7 @@ insert into t1 values (RAND()*1000, RAND()*1000, RAND()*1000); # Later we use binlog to check the order in which statements are # executed so let us reset it first. reset master; -set session debug="+d,sleep_alter_enable_indexes"; +set session debug_dbug="+d,sleep_alter_enable_indexes"; --send alter table t1 enable keys; connection addconroot; --sleep 2 @@ -50,7 +50,7 @@ insert into t2 values (1); insert into t1 values (1, 1, 1); connection default; --reap -set session debug="-d,sleep_alter_enable_indexes"; +set session debug_dbug="-d,sleep_alter_enable_indexes"; # Check that statements were executed/binlogged in correct order. source include/show_binlog_events.inc; @@ -75,7 +75,7 @@ drop table if exists t1, t2, t3; create table t1 (i int); # We are going to check that statements are logged in correct order reset master; -set session debug="+d,sleep_alter_before_main_binlog"; +set session debug_dbug="+d,sleep_alter_before_main_binlog"; --send alter table t1 change i c char(10) default 'Test1'; connect (addconroot, localhost, root,,); connection addconroot; @@ -109,7 +109,7 @@ connection default; --reap disconnect addconroot; drop table t3; -set session debug="-d,sleep_alter_before_main_binlog"; +set session debug_dbug="-d,sleep_alter_before_main_binlog"; # Check that all statements were logged in correct order source include/show_binlog_events.inc; diff --git a/mysql-test/t/archive_debug.test b/mysql-test/t/archive_debug.test index 9cece254140..b107826784b 100644 --- a/mysql-test/t/archive_debug.test +++ b/mysql-test/t/archive_debug.test @@ -7,7 +7,7 @@ --echo # 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; -SET SESSION debug=DEFAULT; +SET SESSION debug_dbug=DEFAULT; DROP TABLE t1; diff --git a/mysql-test/t/crash_commit_before.test b/mysql-test/t/crash_commit_before.test index f99690777c9..93b96de6e53 100644 --- a/mysql-test/t/crash_commit_before.test +++ b/mysql-test/t/crash_commit_before.test @@ -14,7 +14,7 @@ START TRANSACTION; insert into t1 values(9); # Setup the mysqld to crash at certain point -SET GLOBAL debug="d,crash_commit_before"; +SET GLOBAL debug_dbug="d,crash_commit_before"; # Write file to make mysql-test-run.pl expect crash and restart --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect diff --git a/mysql-test/t/create-big.test b/mysql-test/t/create-big.test index e1dfbbd4ac4..65273df3d1d 100644 --- a/mysql-test/t/create-big.test +++ b/mysql-test/t/create-big.test @@ -34,7 +34,7 @@ drop table if exists t1,t2,t3,t4,t5; # What happens in situation when other statement messes with # table to be created before it is created ? # Concurrent CREATE TABLE -set session debug="+d,sleep_create_select_before_create"; +set session debug_dbug="+d,sleep_create_select_before_create"; --send create table t1 select 1 as i; connection addconroot1; --sleep 2 @@ -97,7 +97,7 @@ show create table t1; drop table t1, t3; # What happens if other statement sneaks in after the table # creation but before its opening ? -set session debug="-d,sleep_create_select_before_create:+d,sleep_create_select_before_open"; +set session debug_dbug="-d,sleep_create_select_before_create:+d,sleep_create_select_before_open"; # Concurrent DROP TABLE --send create table t1 select 1 as i; connection addconroot1; @@ -141,7 +141,7 @@ connection default; select @a; drop table t1; # Okay, now the same tests for the potential gap between open and lock -set session debug="-d,sleep_create_select_before_open:+d,sleep_create_select_before_lock"; +set session debug_dbug="-d,sleep_create_select_before_open:+d,sleep_create_select_before_lock"; # Concurrent DROP TABLE --send create table t1 select 1 as i; connection addconroot1; @@ -185,7 +185,7 @@ connection default; select @a; drop table t1; # Some tests for case with existing table -set session debug="-d,sleep_create_select_before_lock:+d,sleep_create_select_before_check_if_exists"; +set session debug_dbug="-d,sleep_create_select_before_lock:+d,sleep_create_select_before_check_if_exists"; create table t1 (i int); # Concurrent DROP TABLE --send create table if not exists t1 select 1 as i; @@ -206,7 +206,7 @@ connection default; select @a; select * from t1; drop table t1; -set session debug="-d,sleep_create_select_before_check_if_exists"; +set session debug_dbug="-d,sleep_create_select_before_check_if_exists"; # Test for some details of CREATE TABLE ... SELECT implementation. @@ -290,7 +290,7 @@ drop table if exists t1,t2; # What happens if some statements sneak in right after we have # opened source table ? create table t1 (i int); -set session debug="+d,sleep_create_like_before_check_if_exists"; +set session debug_dbug="+d,sleep_create_like_before_check_if_exists"; # Reset binlog to have clear start reset master; --send create table t2 like t1; @@ -310,7 +310,7 @@ source include/show_binlog_events.inc; # Now let us check the gap between check for target table # existance and copying of .frm file. create table t1 (i int); -set session debug="-d,sleep_create_like_before_check_if_exists:+d,sleep_create_like_before_copy"; +set session debug_dbug="-d,sleep_create_like_before_check_if_exists:+d,sleep_create_like_before_copy"; # It should be impossible to create target table concurrently --send create table t2 like t1; connection addconroot1; @@ -333,7 +333,7 @@ source include/show_binlog_events.inc; # And now he gap between copying of .frm file and ha_create_table() call. create table t1 (i int); -set session debug="-d,sleep_create_like_before_copy:+d,sleep_create_like_before_ha_create"; +set session debug_dbug="-d,sleep_create_like_before_copy:+d,sleep_create_like_before_ha_create"; # Both DML and DDL on target table should wait till operation completes reset master; --send create table t2 like t1; @@ -361,7 +361,7 @@ source include/show_binlog_events.inc; # Finally we check the gap between ha_create_table() and binlogging create table t1 (i int); -set session debug="-d,sleep_create_like_before_ha_create:+d,sleep_create_like_before_binlogging"; +set session debug_dbug="-d,sleep_create_like_before_ha_create:+d,sleep_create_like_before_binlogging"; reset master; --send create table t2 like t1; connection addconroot1; @@ -385,4 +385,4 @@ connection default; drop table t2; source include/show_binlog_events.inc; -set session debug="-d,sleep_create_like_before_binlogging"; +set session debug_dbug="-d,sleep_create_like_before_binlogging"; diff --git a/mysql-test/t/drop_debug.test b/mysql-test/t/drop_debug.test index 63c85d9246b..21069b57285 100644 --- a/mysql-test/t/drop_debug.test +++ b/mysql-test/t/drop_debug.test @@ -21,14 +21,14 @@ CREATE TABLE mysql_test.t2(b INT); CREATE TABLE mysql_test.t3(c INT); --echo -SET SESSION DEBUG = "+d,bug43138"; +SET SESSION debug_dbug= "+d,bug43138"; --echo --sorted_result DROP DATABASE mysql_test; --echo -SET SESSION DEBUG = "-d,bug43138"; +SET SESSION debug_dbug= "-d,bug43138"; --echo --echo # -- diff --git a/mysql-test/t/error_simulation.test b/mysql-test/t/error_simulation.test index a60eccad3d8..d4de4a9502d 100644 --- a/mysql-test/t/error_simulation.test +++ b/mysql-test/t/error_simulation.test @@ -23,7 +23,7 @@ set tmp_table_size=1024; # Set debug flag so an error is returned when # tmp table in query is converted from heap to myisam -set session debug="d,raise_error"; +set session debug_dbug="d,raise_error"; --replace_regex /in table '[^']+'/in table 'tmp_table'/ --error ER_DUP_KEY @@ -38,9 +38,9 @@ DROP TABLE t1; --echo # 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; SELECT * FROM t1; DROP TABLE t1; @@ -51,11 +51,11 @@ DROP TABLE t1; CREATE TABLE t1(a BLOB); -SET SESSION debug="+d,bug42064_simulate_oom"; +SET SESSION debug_dbug="+d,bug42064_simulate_oom"; # May fail with either ER_OUT_OF_RESOURCES or EE_OUTOFMEMORY --error ER_OUT_OF_RESOURCES, 5 INSERT INTO t1 VALUES(""); -SET SESSION debug=DEFAULT; +SET SESSION debug_dbug=DEFAULT; DROP TABLE t1; @@ -78,14 +78,14 @@ INSERT INTO t2 VALUES (1, 1, 'data'); --echo # we would need to have thousands of records and/or more columns in both --echo # 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'; --replace_column 1 x 2 x 3 x 4 x 5 x 6 x 7 x 8 x 9 x EXPLAIN SELECT * FROM t1 LEFT JOIN t2 ON ( t2.a < 10 OR t2.b < 10 ); SELECT * FROM t1 LEFT JOIN t2 ON ( t2.a < 10 OR t2.b < 10 ); -SET SESSION debug = DEFAULT; +SET SESSION debug_dbug= DEFAULT; DROP TABLE t1, t2; diff --git a/mysql-test/t/filesort_debug.test b/mysql-test/t/filesort_debug.test index 724ebc90368..88d957e47c3 100644 --- a/mysql-test/t/filesort_debug.test +++ b/mysql-test/t/filesort_debug.test @@ -11,11 +11,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"); --error ER_OUT_OF_SORTMEMORY SELECT * FROM t1 ORDER BY f1 ASC, f0; -SET session debug= @old_debug; +SET session debug_dbug= @old_debug; CREATE FUNCTION f1() RETURNS INT RETURN 1; --error ER_SP_WRONG_NO_OF_ARGS diff --git a/mysql-test/t/information_schema_all_engines.test b/mysql-test/t/information_schema_all_engines.test index 97065803169..036dd944cc3 100644 --- a/mysql-test/t/information_schema_all_engines.test +++ b/mysql-test/t/information_schema_all_engines.test @@ -8,7 +8,6 @@ --source include/not_staging.inc use INFORMATION_SCHEMA; ---replace_result Tables_in_INFORMATION_SCHEMA Tables_in_information_schema show tables; # diff --git a/mysql-test/t/innodb_mysql_sync.test b/mysql-test/t/innodb_mysql_sync.test index ec8fa55fc5c..2f3bd643837 100644 --- a/mysql-test/t/innodb_mysql_sync.test +++ b/mysql-test/t/innodb_mysql_sync.test @@ -292,7 +292,7 @@ INSERT INTO t1 VALUES (1, 12345), (2, 23456); --echo # Connection con1 --connect (con1,localhost,root) -SET SESSION debug= "+d,alter_table_rollback_new_index"; +SET SESSION debug_dbug= "+d,alter_table_rollback_new_index"; --error ER_UNKNOWN_ERROR ALTER TABLE t1 ADD PRIMARY KEY(a); SELECT * FROM t1; diff --git a/mysql-test/t/log_tables_debug.test b/mysql-test/t/log_tables_debug.test index 78a1289b689..971c11d458f 100644 --- a/mysql-test/t/log_tables_debug.test +++ b/mysql-test/t/log_tables_debug.test @@ -30,7 +30,7 @@ SET @@global.general_log = ON; SET @@global.general_log_file = 'bug45387_general.log'; # turn on output of timestamps on all log file entries -SET SESSION debug='+d,reset_log_last_time'; +SET SESSION debug_dbug='+d,reset_log_last_time'; let CONN_ID= `SELECT CONNECTION_ID()`; FLUSH LOGS; @@ -38,7 +38,7 @@ FLUSH LOGS; # reset log settings 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'; perl; # get the relevant info from the surrounding perl invocation diff --git a/mysql-test/t/merge-big.test b/mysql-test/t/merge-big.test index e39bd98bd38..78c3e8c00ac 100644 --- a/mysql-test/t/merge-big.test +++ b/mysql-test/t/merge-big.test @@ -44,7 +44,7 @@ LOCK TABLE t1 WRITE; connect (con1,localhost,root,,); let $con1_id= `SELECT CONNECTION_ID()`; SET @orig_debug=@@debug; - SET GLOBAL debug="+d,sleep_open_and_lock_after_open"; + SET GLOBAL debug_dbug="+d,sleep_open_and_lock_after_open"; send INSERT INTO t1 VALUES (1); --echo # connection default connection default; @@ -75,7 +75,7 @@ UNLOCK TABLES; --echo # connection con1 connection con1; reap; - SET GLOBAL debug=@orig_debug; + SET GLOBAL debug_dbug=@orig_debug; disconnect con1; --echo # connection default connection default; diff --git a/mysql-test/t/merge_debug.test b/mysql-test/t/merge_debug.test index 5bf01468b89..78c91ec8f25 100644 --- a/mysql-test/t/merge_debug.test +++ b/mysql-test/t/merge_debug.test @@ -26,11 +26,11 @@ 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"; --disable_warnings CREATE TRIGGER t1_ai AFTER INSERT ON crashed FOR EACH ROW INSERT INTO t2 VALUES(29); --enable_warnings -SET GLOBAL debug=@orig_debug; +SET GLOBAL debug_dbug=@orig_debug; --error ER_TABLE_NOT_LOCKED INSERT INTO t4 VALUES (39); --error ER_TABLE_NOT_LOCKED diff --git a/mysql-test/t/myisam_crash_before_flush_keys.test b/mysql-test/t/myisam_crash_before_flush_keys.test index a9f36f40d10..2447ba1e229 100644 --- a/mysql-test/t/myisam_crash_before_flush_keys.test +++ b/mysql-test/t/myisam_crash_before_flush_keys.test @@ -22,7 +22,7 @@ CREATE TABLE t1(a INT, INSERT INTO t1 VALUES (1,2),(2,3),(3,4),(4,5),(5,6); --echo # 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"; --echo # Write file to make mysql-test-run.pl expect crash --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect diff --git a/mysql-test/t/myisam_debug.test b/mysql-test/t/myisam_debug.test index 43b5143441e..5b5d006bd22 100644 --- a/mysql-test/t/myisam_debug.test +++ b/mysql-test/t/myisam_debug.test @@ -36,7 +36,7 @@ commit; --echo # Switch to insert Connection CONNECTION insertConn; -SET SESSION debug='+d,wait_in_enable_indexes'; +SET SESSION debug_dbug='+d,wait_in_enable_indexes'; --echo # Send insert data SEND INSERT INTO t1(id) SELECT id FROM t2; diff --git a/mysql-test/t/mysqldump-compat.opt b/mysql-test/t/mysqldump-compat.opt index 40d4ac738a6..ac3d0509f2c 100644 --- a/mysql-test/t/mysqldump-compat.opt +++ b/mysql-test/t/mysqldump-compat.opt @@ -1 +1 @@ ---loose-debug=d,4x_server_emul +--loose-debug-dbug=d,4x_server_emul diff --git a/mysql-test/t/partition_debug_sync.test b/mysql-test/t/partition_debug_sync.test index 448cec652d7..027a4bd19a7 100644 --- a/mysql-test/t/partition_debug_sync.test +++ b/mysql-test/t/partition_debug_sync.test @@ -30,7 +30,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'; --send ALTER TABLE t1 REMOVE PARTITIONING @@ -43,7 +43,7 @@ DROP TABLE IF EXISTS t1; --echo # Con 1 connection con1; --reap -SET SESSION debug= "-d,sleep_before_create_table_no_lock"; +SET SESSION debug_dbug= "-d,sleep_before_create_table_no_lock"; connection default; SET DEBUG_SYNC= 'RESET'; connection con1; @@ -70,12 +70,12 @@ SET DEBUG_SYNC= 'alter_table_before_rename_result_table WAIT_FOR delete_done'; --send ALTER TABLE t2 REMOVE PARTITIONING connection default; --echo # 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"; --echo # Con 1 connection con1; --error ER_NO_SUCH_TABLE diff --git a/mysql-test/t/partition_sync.test b/mysql-test/t/partition_sync.test index 85eb33ebb6b..d5d60c176c5 100644 --- a/mysql-test/t/partition_sync.test +++ b/mysql-test/t/partition_sync.test @@ -66,7 +66,7 @@ SELECT * FROM tbl_with_partitions; --echo # Connection 2 --echo # Alter table, abort after prepare connection con2; -set session debug="+d,abort_copy_table"; +set session debug_dbug="+d,abort_copy_table"; --error ER_LOCK_WAIT_TIMEOUT ALTER TABLE tbl_with_partitions ADD COLUMN f INT; diff --git a/mysql-test/t/select_debug.test b/mysql-test/t/select_debug.test index 16e8425efc4..4b77f9fd047 100644 --- a/mysql-test/t/select_debug.test +++ b/mysql-test/t/select_debug.test @@ -10,7 +10,7 @@ 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; select t1.b from t1,t2 where t1.b=t2.a; diff --git a/mysql-test/t/sp-code.test b/mysql-test/t/sp-code.test index 90b4c18895a..4c1b287769d 100644 --- a/mysql-test/t/sp-code.test +++ b/mysql-test/t/sp-code.test @@ -696,9 +696,9 @@ END| delimiter ;| -SET SESSION debug="+d,bug23032_emit_warning"; +SET SESSION debug_dbug="+d,bug23032_emit_warning"; CALL p1(); -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/t/subselect_debug.test b/mysql-test/t/subselect_debug.test index ee515733afa..101311beb5c 100644 --- a/mysql-test/t/subselect_debug.test +++ b/mysql-test/t/subselect_debug.test @@ -10,8 +10,8 @@ INSERT INTO t1 VALUES (1),(2),(3),(4); INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d; # Setup the mysqld to crash at certain point 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; SELECT REVERSE(EXISTS(SELECT RAND() FROM t1)); -SET GLOBAL debug=@orig_debug; +SET GLOBAL debug_dbug=@orig_debug; DROP TABLE t1; diff --git a/mysql-test/t/variables_debug.test b/mysql-test/t/variables_debug.test index 6a3bc749b2a..b57ff812ef5 100644 --- a/mysql-test/t/variables_debug.test +++ b/mysql-test/t/variables_debug.test @@ -6,11 +6,11 @@ SET @old_debug = @@GLOBAL.debug; # Bug#34678 @@debug variable's incremental mode # -set debug= 'T'; +set debug_dbug= 'T'; select @@debug; -set debug= '+P'; +set debug_dbug= '+P'; select @@debug; -set debug= '-P'; +set debug_dbug= '-P'; select @@debug; # @@ -19,7 +19,7 @@ select @@debug; SELECT @@session.debug, @@global.debug; -SET SESSION debug = ''; +SET SESSION debug_dbug= ''; SELECT @@session.debug, @@global.debug; @@ -28,12 +28,12 @@ SELECT @@session.debug, @@global.debug; --echo # binlog.binlog_write_error --echo # -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; SELECT @@global.debug; -SET GLOBAL debug=''; +SET GLOBAL debug_dbug=''; SELECT @@global.debug; -SET GLOBAL debug=@old_debug; +SET GLOBAL debug_dbug=@old_debug; --echo # --echo # Bug #56709: Memory leaks at running the 5.1 test suite @@ -41,12 +41,12 @@ SET GLOBAL debug=@old_debug; SET @old_local_debug = @@debug; -SET @@debug='d,foo'; +SET @@debug_dbug='d,foo'; SELECT @@debug; -SET @@debug=''; +SET @@debug_dbug=''; SELECT @@debug; -SET @@debug = @old_local_debug; +SET @@debug_dbug= @old_local_debug; --echo End of 5.1 tests @@ -59,57 +59,57 @@ SET @old_globaldebug = @@global.debug; SET @old_sessiondebug= @@session.debug; --echo # Test 1 - Bug test case, single connection -SET GLOBAL debug= '+O,../../log/bug46165.1.trace'; -SET SESSION debug= '-d:-t:-i'; +SET GLOBAL debug_dbug= '+O,../../log/bug46165.1.trace'; +SET SESSION debug_dbug= '-d:-t:-i'; -SET GLOBAL debug= ''; -SET SESSION debug= ''; +SET GLOBAL debug_dbug= ''; +SET SESSION debug_dbug= ''; --echo # Test 2 - Bug test case, two connections --echo # Connection default 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'; --echo # Connection con1 connect (con1, localhost, root); -SET GLOBAL debug= ''; +SET GLOBAL debug_dbug= ''; --echo # Connection default connection default; -SET SESSION debug= ''; +SET SESSION debug_dbug= ''; --echo # Connection con1 connection con1; disconnect con1; --source include/wait_until_disconnected.inc --echo # Connection default connection default; -SET GLOBAL debug= ''; +SET GLOBAL debug_dbug= ''; --echo # Test 3 - Active session trace file on disconnect --echo # Connection con1 connect (con1, localhost, root); -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= ''; disconnect con1; --source include/wait_until_disconnected.inc --echo # Test 4 - Active session trace file on two connections --echo # Connection default 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'; --echo # Connection con1 connect (con1, localhost, root); -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= ''; --echo # Connection default connection default; -SET SESSION debug= ''; +SET SESSION debug_dbug= ''; --echo # Connection con1 connection con1; disconnect con1; @@ -118,9 +118,9 @@ disconnect con1; connection default; --echo # 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 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= @old_globaldebug; -SET SESSION debug= @old_sessiondebug; +SET GLOBAL debug_dbug= @old_globaldebug; +SET SESSION debug_dbug= @old_sessiondebug; diff --git a/mysql-test/t/variables_debug_notembedded.test b/mysql-test/t/variables_debug_notembedded.test index 2d6b53b16ab..cb3797465a7 100644 --- a/mysql-test/t/variables_debug_notembedded.test +++ b/mysql-test/t/variables_debug_notembedded.test @@ -13,15 +13,15 @@ connect(con2,localhost,root,,test,,); # makes output independant of current debug status connection con1; -set session debug="t"; +set session debug_dbug="t"; show session variables like 'debug'; connection con2; -set session debug="t"; +set session debug_dbug="t"; show session variables like 'debug'; # checks influence one session debug variable on another connection con1; -set session debug="d:t"; +set session debug_dbug="d:t"; show session variables like 'debug'; connection con2; show session variables like 'debug'; diff --git a/mysql-test/t/warnings_debug.test b/mysql-test/t/warnings_debug.test index 99d02330960..3055e3894e5 100644 --- a/mysql-test/t/warnings_debug.test +++ b/mysql-test/t/warnings_debug.test @@ -9,7 +9,7 @@ create table t1 (a int primary key) engine=innodb; # Test that warnings produced during autocommit (after calling # set_ok_status()) are still reported to the client. -SET SESSION debug="+d,warn_during_ha_commit_trans"; +SET SESSION debug_dbug="+d,warn_during_ha_commit_trans"; INSERT INTO t1 VALUES (1); # The warning will be shown automatically by mysqltest; there was a bug where # this didn't happen because the warning was not counted when sending result |