diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
| commit | cd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch) | |
| tree | 95bf82d0e0522c6af708cd28639c82e004b5a264 /mysql-test/t/merge-big.test | |
| parent | f884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff) | |
| parent | d516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff) | |
| download | mariadb-git-10.2-connector-c-integ.tar.gz | |
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
Diffstat (limited to 'mysql-test/t/merge-big.test')
| -rw-r--r-- | mysql-test/t/merge-big.test | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mysql-test/t/merge-big.test b/mysql-test/t/merge-big.test index 78c3e8c00ac..9bd2cab2c8a 100644 --- a/mysql-test/t/merge-big.test +++ b/mysql-test/t/merge-big.test @@ -40,13 +40,11 @@ drop table if exists t1,t2,t3,t4,t5,t6; CREATE TABLE t1 (c1 INT) ENGINE= MyISAM; LOCK TABLE t1 WRITE; #SELECT NOW(); - --echo # connection con1 connect (con1,localhost,root,,); let $con1_id= `SELECT CONNECTION_ID()`; SET @orig_debug=@@debug; SET GLOBAL debug_dbug="+d,sleep_open_and_lock_after_open"; send INSERT INTO t1 VALUES (1); ---echo # connection default connection default; --echo # Let INSERT go into thr_multi_lock(). #--sleep 8 @@ -72,12 +70,9 @@ FLUSH TABLES; SELECT * FROM t1; #SELECT NOW(); UNLOCK TABLES; - --echo # connection con1 connection con1; reap; SET GLOBAL debug_dbug=@orig_debug; disconnect con1; ---echo # connection default connection default; DROP TABLE t1; - |