Commit 763b01c9 authored by Mikael Ronstrom's avatar Mikael Ronstrom

Post-merge fix: wait for statement result before disconnecting. Otherwise the...

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
parent 39ca1f0e
...@@ -625,9 +625,11 @@ let $wait_condition= ...@@ -625,9 +625,11 @@ let $wait_condition=
--source include/wait_condition.inc --source include/wait_condition.inc
let $tlwb= `show status like 'Table_locks_waited'`; let $tlwb= `show status like 'Table_locks_waited'`;
unlock tables; unlock tables;
connection waiter;
--reap
connection default;
drop table t1; drop table t1;
disconnect waiter; disconnect waiter;
connection default;
--disable_query_log --disable_query_log
eval SET @tlwa= SUBSTRING_INDEX('$tlwa', ' ', -1); eval SET @tlwa= SUBSTRING_INDEX('$tlwa', ' ', -1);
eval SET @tlwb= SUBSTRING_INDEX('$tlwb', ' ', -1); eval SET @tlwb= SUBSTRING_INDEX('$tlwb', ' ', -1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment