diff options
author | unknown <anozdrin/alik@booka.site> | 2006-07-20 13:24:12 +0400 |
---|---|---|
committer | unknown <anozdrin/alik@booka.site> | 2006-07-20 13:24:12 +0400 |
commit | d8180d44b81519ee1d1db8fe79caa2a6d1d6a5eb (patch) | |
tree | 565aea909bd18f5ad6cf3c333ae9891a59139c0f /mysql-test/r/im_utils.result | |
parent | ec4a7522ce6b3363881b3b9b2d7140e672297347 (diff) | |
download | mariadb-git-d8180d44b81519ee1d1db8fe79caa2a6d1d6a5eb.tar.gz |
Fix for BUG#20716: SHOW INSTANCES statement causes races in IM tests.
Fix for the bug in mysql-test-run.pl which prevents other tests succeed
after IM-test failure.
The idea of the fix of BUG#20716 is to:
1. Check each SHOW INSTANCES statement, add necessary "sleep" instruction before;
2. Move all environment checkings into the one file and include it everywhere.
mysql-test/mysql-test-run.pl:
Fix bug in mysql-test-run.pl -- kill leftovers if some
guarded mysqld-instance is still alive after IM shutdown.
mysql-test/r/im_daemon_life_cycle.result:
Updated result file.
mysql-test/r/im_life_cycle.result:
Updated result file.
mysql-test/r/im_options_set.result:
Updated result file.
mysql-test/r/im_options_unset.result:
Updated result file.
mysql-test/r/im_utils.result:
Updated result file.
mysql-test/t/im_daemon_life_cycle.imtest:
Include im_check_env.inc for the checking of environment.
mysql-test/t/im_life_cycle.imtest:
Include im_check_env.inc for the checking of environment.
mysql-test/t/im_options_set.imtest:
Include im_check_env.inc for the checking of environment.
mysql-test/t/im_options_unset.imtest:
Include im_check_env.inc for the checking of environment.
mysql-test/t/im_utils.imtest:
Include im_check_env.inc for the checking of environment.
mysql-test/include/im_check_env.inc:
A new file to be included in each IM-test.
The statements in the file ensure that starting
conditions (environment) are as expected.
Diffstat (limited to 'mysql-test/r/im_utils.result')
-rw-r--r-- | mysql-test/r/im_utils.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/im_utils.result b/mysql-test/r/im_utils.result index e6a5e007ed4..be696921812 100644 --- a/mysql-test/r/im_utils.result +++ b/mysql-test/r/im_utils.result @@ -1,4 +1,7 @@ Success: the process has been started. +SHOW VARIABLES LIKE 'server_id'; +Variable_name Value +server_id 1 SHOW INSTANCES; instance_name status mysqld1 online |