diff options
Diffstat (limited to 'mysql-test/t')
23 files changed, 85 insertions, 86 deletions
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 |