diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-10-03 21:12:24 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-10-03 21:12:24 +0200 |
| commit | 22a9f9b243f1144ea4e58c353109e5aa4cfca50e (patch) | |
| tree | d769931399e1fae29d142422897b030ec71d5cb6 /mysql-test/t/merge-big.test | |
| parent | 3e052e0f4ad02e2de4d6581ab3ddb80faa9f6764 (diff) | |
| download | mariadb-git-22a9f9b243f1144ea4e58c353109e5aa4cfca50e.tar.gz | |
Fix merge-big.test to properly restore debug settings.
Otherwise following tests go crazy in the log, writing gigabytes of data
and causing havoc.
Diffstat (limited to 'mysql-test/t/merge-big.test')
| -rw-r--r-- | mysql-test/t/merge-big.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/t/merge-big.test b/mysql-test/t/merge-big.test index 62af9f22299..d39c2973688 100644 --- a/mysql-test/t/merge-big.test +++ b/mysql-test/t/merge-big.test @@ -43,6 +43,7 @@ LOCK TABLE t1 WRITE; --echo # connection con1 connect (con1,localhost,root,,); let $con1_id= `SELECT CONNECTION_ID()`; + SET @orig_debug=@@debug; SET GLOBAL debug="+d,sleep_open_and_lock_after_open"; send INSERT INTO t1 VALUES (1); --echo # connection default @@ -74,7 +75,7 @@ UNLOCK TABLES; --echo # connection con1 connection con1; reap; - SET GLOBAL debug="-d,sleep_open_and_lock_after_open"; + SET GLOBAL debug=@orig_debug; disconnect con1; --echo # connection default connection default; |