diff options
author | anozdrin/alik@booka.site <> | 2006-07-20 13:24:12 +0400 |
---|---|---|
committer | anozdrin/alik@booka.site <> | 2006-07-20 13:24:12 +0400 |
commit | bf10578fde502a81f56eaf91d556930ae0327893 (patch) | |
tree | 565aea909bd18f5ad6cf3c333ae9891a59139c0f /mysql-test/t/im_utils.imtest | |
parent | ed2d8cce575710f8d821fbaed4f35b6263525d87 (diff) | |
download | mariadb-git-bf10578fde502a81f56eaf91d556930ae0327893.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.
Diffstat (limited to 'mysql-test/t/im_utils.imtest')
-rw-r--r-- | mysql-test/t/im_utils.imtest | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/mysql-test/t/im_utils.imtest b/mysql-test/t/im_utils.imtest index 47902eeba52..4c05b342af5 100644 --- a/mysql-test/t/im_utils.imtest +++ b/mysql-test/t/im_utils.imtest @@ -7,36 +7,17 @@ ########################################################################### --source include/im_check_os.inc +--source include/im_check_env.inc ########################################################################### # -# Check starting conditions. This test case assumes that: -# - two mysqld-instances are registered; -# - the first instance is online; -# - the second instance is offline; +# Check 'SHOW INSTANCE OPTIONS' command. # - -# Wait for mysqld1 (guarded instance) to start. - ---exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD1_PATH_PID 30 started - -# Let IM detect that mysqld1 is online. This delay should be longer than -# monitoring interval. - ---sleep 3 - -# Check that start conditions are as expected. - -SHOW INSTANCES; - -# -# Check 'SHOW INSTANCE OPTIONS' command: -# - check that options of both offline and online instances are accessible; -# - since configuration of an mysqld-instance contains directories, we should -# completely ignore the second column (values) in order to make the test -# case produce the same results on different installations; -# TODO: ignore values of only directory-specific options. +# Since configuration of an mysqld-instance contains directories, we should +# completely ignore the second column (values) in order to make the test +# case produce the same results on different installations; +# TODO: ignore values of only directory-specific options. # --replace_column 2 VALUE |