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/status.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/status.test')
| -rw-r--r-- | mysql-test/t/status.test | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/t/status.test b/mysql-test/t/status.test index 69ae56ff9a2..5842f59af5c 100644 --- a/mysql-test/t/status.test +++ b/mysql-test/t/status.test @@ -268,6 +268,7 @@ show status like 'Com%function'; # connect (root, localhost, root,,test); connection root; +let $root_connection_id= `select connection_id()`; --disable_warnings create database db37908; --enable_warnings @@ -282,6 +283,7 @@ delimiter ;| connect (user1,localhost,mysqltest_1,,test); connection user1; +let $user1_connection_id= `select connection_id()`; --error ER_TABLEACCESS_DENIED_ERROR select * from db37908.t1; @@ -300,8 +302,12 @@ drop procedure proc37908; drop function func37908; REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; DROP USER mysqltest_1@localhost; -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc +# Wait till the sessions user1 and root are disconnected +let $wait_condition = + SELECT COUNT(*) = 0 + FROM information_schema.processlist + WHERE id in ('$root_connection_id','$user1_connection_id'); +--source include/wait_condition.inc # # Bug#41131 "Questions" fails to increment - ignores statements instead stored procs |