diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-04-11 16:15:19 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-04-11 16:15:19 +0300 |
| commit | 5bada1246de48ef4a18fa30388f06719c971c3d7 (patch) | |
| tree | 65de1dc70eebfc94385afadb7202b86a009425c8 /mysql-test/main/status.test | |
| parent | 375991a531f8885634e7a2af224bf396ee7e1f60 (diff) | |
| parent | fb72dfbf7fb52a4be12bad7f173baa71942fd558 (diff) | |
| download | mariadb-git-5bada1246de48ef4a18fa30388f06719c971c3d7.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main/status.test')
| -rw-r--r-- | mysql-test/main/status.test | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/mysql-test/main/status.test b/mysql-test/main/status.test index 78626615d45..a1baa36baf8 100644 --- a/mysql-test/main/status.test +++ b/mysql-test/main/status.test @@ -280,7 +280,6 @@ 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 @@ -296,7 +295,6 @@ 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; @@ -315,11 +313,8 @@ drop procedure proc37908; drop function func37908; REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; DROP USER mysqltest_1@localhost; -# 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'); +# Wait until all non-default sessions are disconnected +let $wait_condition = SELECT COUNT(*) = 1 FROM information_schema.processlist; --source include/wait_condition.inc # |