diff options
| author | Matthias Leich <Matthias.Leich@sun.com> | 2009-05-15 12:15:56 +0200 |
|---|---|---|
| committer | Matthias Leich <Matthias.Leich@sun.com> | 2009-05-15 12:15:56 +0200 |
| commit | 21f878e7243346efa9e8ae41400528a8d5cb76cb (patch) | |
| tree | 4d992c0688078d328a4150d979caaf623fd345ef /mysql-test/include/grant_cache.inc | |
| parent | 1b7424b9b70438b8844ba34a4eb3169146660664 (diff) | |
| download | mariadb-git-21f878e7243346efa9e8ae41400528a8d5cb76cb.tar.gz | |
Fix for Bug#42308 Several server tests do not pass MTR's --check option
Details:
Most tests mentioned within the bug report were already fixed.
The test modified here failed in stability (high parallel load) tests.
Details:
1. Take care that disconnects are finished before the test terminates.
2. Correct wrong handling of send/reap in events_stress which caused
random garbled output
3. Minor beautifying of script code
Diffstat (limited to 'mysql-test/include/grant_cache.inc')
| -rw-r--r-- | mysql-test/include/grant_cache.inc | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/mysql-test/include/grant_cache.inc b/mysql-test/include/grant_cache.inc index 501e115f0ee..47eef1cdb67 100644 --- a/mysql-test/include/grant_cache.inc +++ b/mysql-test/include/grant_cache.inc @@ -171,15 +171,30 @@ show status like "Qcache_not_cached"; # Cleanup ---echo ----- switch to connection default and close connections ----- -connection default; +--echo ----- close connections ----- +connection root; disconnect root; +--source include/wait_until_disconnected.inc +connection root2; disconnect root2; +--source include/wait_until_disconnected.inc +connection user1; disconnect user1; +--source include/wait_until_disconnected.inc +connection user2; disconnect user2; +--source include/wait_until_disconnected.inc +connection user3; disconnect user3; +--source include/wait_until_disconnected.inc +connection user4; disconnect user4; +--source include/wait_until_disconnected.inc +connection unkuser; disconnect unkuser; +--source include/wait_until_disconnected.inc +--echo ----- switch to connection default ----- +connection default; # # A temporary 4.1 workaround to make this test pass if |