diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-12-19 13:26:00 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-12-19 13:26:00 +0100 |
| commit | 6bcd9edc8a998f2e79ac762000e9fee93b647949 (patch) | |
| tree | 730364a04be1f2ca4f5daa06829abed31236a71f | |
| parent | 6ee1776ccf6f348a837e5f0383f12c15d3630672 (diff) | |
| download | mariadb-git-6bcd9edc8a998f2e79ac762000e9fee93b647949.tar.gz | |
Post-merge fix: wait for statement result before disconnecting. Otherwise the statement might affect unrelated tests. mysql-test/t/lock_multi.test, Reap statement status
| -rw-r--r-- | mysql-test/t/lock_multi.test | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/t/lock_multi.test b/mysql-test/t/lock_multi.test index 47b5aa0292b..4df1a0f3478 100644 --- a/mysql-test/t/lock_multi.test +++ b/mysql-test/t/lock_multi.test @@ -626,9 +626,11 @@ let $wait_condition= --source include/wait_condition.inc let $tlwb= `show status like 'Table_locks_waited'`; unlock tables; +connection waiter; +--reap +connection default; drop table t1; disconnect waiter; -connection default; --disable_query_log eval SET @tlwa= SUBSTRING_INDEX('$tlwa', ' ', -1); eval SET @tlwb= SUBSTRING_INDEX('$tlwb', ' ', -1); |