diff options
| author | Matthias Leich <Matthias.Leich@sun.com> | 2009-03-06 15:56:17 +0100 |
|---|---|---|
| committer | Matthias Leich <Matthias.Leich@sun.com> | 2009-03-06 15:56:17 +0100 |
| commit | 2417d31045cde81881a9dd7991263210687d5fc8 (patch) | |
| tree | 88da5851e80389eb99993e7f017a4a90b48f7a00 /mysql-test/t/wait_timeout.test | |
| parent | 16c0631f0b785e82aef63429b5a4e7179b8aa52e (diff) | |
| parent | 0183d4d8422ba29a632eebb1e856391f2b9a289f (diff) | |
| download | mariadb-git-2417d31045cde81881a9dd7991263210687d5fc8.tar.gz | |
Merge 5.0 -> 5.1 of fix for Bug#42003 and Bug#43114
Diffstat (limited to 'mysql-test/t/wait_timeout.test')
| -rw-r--r-- | mysql-test/t/wait_timeout.test | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mysql-test/t/wait_timeout.test b/mysql-test/t/wait_timeout.test index 63809252a01..6947e346675 100644 --- a/mysql-test/t/wait_timeout.test +++ b/mysql-test/t/wait_timeout.test @@ -10,8 +10,11 @@ -- source include/not_embedded.inc -- source include/one_thread_per_connection.inc +# Save the initial number of concurrent sessions +--source include/count_sessions.inc + # -# Bug#8731: wait_timeout does not work on Mac OS X +# Bug#8731 wait_timeout does not work on Mac OS X # let $start_value= `SELECT @@global.wait_timeout`; @@ -113,6 +116,7 @@ while (!`select @aborted_clients`) # the disconnect has reached client let $wait_condition= SELECT COUNT(*)=1 FROM information_schema.processlist; --source include/wait_condition.inc +disconnect wait_con; --echo connection con1; connection con1; @@ -126,8 +130,13 @@ SELECT 2; SELECT 3; --replace_result $start_value <start_value> eval SET @@global.wait_timeout= $start_value; -# ML: The start value might be changed in future ... --echo disconnection con1; disconnect con1; +# The last connect is to keep tools checking the current test happy. +connect (default,localhost,root,,test,,); + +# Wait till all disconnects are completed +--source include/wait_until_count_sessions.inc + |