From b66b3c1635dbda369b1466c7c7ff6103ae09ae66 Mon Sep 17 00:00:00 2001
From: Davi Arnaut <Davi.Arnaut@Sun.COM>
Date: Fri, 18 Dec 2009 18:32:55 -0200
Subject: [PATCH] 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.
---
 mysql-test/t/lock_multi.test | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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);