database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Fix merge-big.test to properly restore debug settings.

Browse Source 
Otherwise following tests go crazy in the log, writing gigabytes of data
and causing havoc.
This commit is contained in:
unknown
2009-10-03 21:12:24 +02:00
parent 3e052e0f4a
commit 22a9f9b243
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/merge-big.result
View File

@@ -7,6 +7,7 @@ drop table if exists t1,t2,t3,t4,t5,t6;
CREATE TABLE t1 (c1 INT) ENGINE= MyISAM; CREATE TABLE t1 (c1 INT) ENGINE= MyISAM;
LOCK TABLE t1 WRITE; LOCK TABLE t1 WRITE;
# connection con1 # connection con1
SET @orig_debug=@@debug;
SET GLOBAL debug="+d,sleep_open_and_lock_after_open"; SET GLOBAL debug="+d,sleep_open_and_lock_after_open";
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);
# connection default # connection default
@@ -21,6 +22,6 @@ SELECT * FROM t1;
c1 c1
UNLOCK TABLES; UNLOCK TABLES;
# connection con1 # connection con1
SET GLOBAL debug="-d,sleep_open_and_lock_after_open"; SET GLOBAL debug=@orig_debug;
# connection default # connection default
DROP TABLE t1; DROP TABLE t1;

3
mysql-test/t/merge-big.test
View File

@@ -43,6 +43,7 @@ LOCK TABLE t1 WRITE;
--echo # connection con1 --echo # connection con1
connect (con1,localhost,root,,); connect (con1,localhost,root,,);
let $con1_id= `SELECT CONNECTION_ID()`; let $con1_id= `SELECT CONNECTION_ID()`;
SET @orig_debug=@@debug;
SET GLOBAL debug="+d,sleep_open_and_lock_after_open"; SET GLOBAL debug="+d,sleep_open_and_lock_after_open";
send INSERT INTO t1 VALUES (1); send INSERT INTO t1 VALUES (1);
--echo # connection default --echo # connection default
@@ -74,7 +75,7 @@ UNLOCK TABLES;
--echo # connection con1 --echo # connection con1
connection con1; connection con1;
reap; reap;
SET GLOBAL debug="-d,sleep_open_and_lock_after_open"; SET GLOBAL debug=@orig_debug;
disconnect con1; disconnect con1;
--echo # connection default --echo # connection default
connection default; connection default;