diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-12-19 08:37:08 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-12-19 08:37:08 +0100 |
| commit | efc20b24fc91a54d48b8194489f679cffe828666 (patch) | |
| tree | edfea94b2e0710efb9c8742bcc9ba0bf0739a833 /mysql-test/t/lock_multi.test | |
| parent | 45e62fba06e2ac9684c3d1990204383f84aba011 (diff) | |
| download | mariadb-git-efc20b24fc91a54d48b8194489f679cffe828666.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
Diffstat (limited to 'mysql-test/t/lock_multi.test')
| -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 75ee6d07723..5670276ee2e 100644 --- a/mysql-test/t/lock_multi.test +++ b/mysql-test/t/lock_multi.test @@ -625,9 +625,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); |