summaryrefslogtreecommitdiff
path: root/mysql-test/t/lock_multi.test
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2009-12-18 18:32:55 -0200
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2009-12-18 18:32:55 -0200
commitb66b3c1635dbda369b1466c7c7ff6103ae09ae66 (patch)
tree4e204c766a100bfc2d515a31c7e319770468f7f9 /mysql-test/t/lock_multi.test
parent25be2b28d180e34afb8579311e431a6772f40809 (diff)
downloadmariadb-git-b66b3c1635dbda369b1466c7c7ff6103ae09ae66.tar.gz
Bug#30331: Table_locks_waited shows inaccurate values
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.test4
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);