diff options
| author | unknown <anozdrin@mysql.com> | 2006-06-22 18:56:22 +0400 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2006-06-22 18:56:22 +0400 |
| commit | bd6f56a798efcac209dc4bcf1c83cb2eeffe1b5c (patch) | |
| tree | 4c968f682e7cb8cc9e55167ff47de831f4c7ca71 /mysql-test/t | |
| parent | d3a7137aa99f0b48f980fa8c5b48eec209a061e7 (diff) | |
| download | mariadb-git-bd6f56a798efcac209dc4bcf1c83cb2eeffe1b5c.tar.gz | |
Additional fix for BUG#20294: Instance manager test
im_instance_conf fails randomly.
mysql-test/r/im_options.result:
Updated result file.
mysql-test/t/im_instance_conf.imtest:
Added a note about specific of CREATE INSTANCE usage in IM-tests.
mysql-test/t/im_options.imtest:
1. Specify socket-file-name for new instance so that the test
does not depend on another running test-suite on the same box.
2. Added a note about specific of CREATE INSTANCE usage in IM-tests.
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/im_instance_conf.imtest | 3 | ||||
| -rw-r--r-- | mysql-test/t/im_options.imtest | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/mysql-test/t/im_instance_conf.imtest b/mysql-test/t/im_instance_conf.imtest index 2cd7b955978..3d254b16ca5 100644 --- a/mysql-test/t/im_instance_conf.imtest +++ b/mysql-test/t/im_instance_conf.imtest @@ -21,6 +21,9 @@ # - DROP INSTANCE fails for active instance. # - DROP INSTANCE updates both config file and internal configuration cache; # +# NOTE: each CREATE INSTANCE statement must specify socket-file-name, otherwise +# this results of the test can be affected by another running test suite. +# ########################################################################### --source include/im_check_os.inc diff --git a/mysql-test/t/im_options.imtest b/mysql-test/t/im_options.imtest index cd905416cda..55bd29c9ee1 100644 --- a/mysql-test/t/im_options.imtest +++ b/mysql-test/t/im_options.imtest @@ -21,12 +21,15 @@ # - server_id # - port # - nonguarded - +# # Let's test SET statement on the option 'server_id'. It's expected that # originally the instances have the following server ids and states: # - mysqld1: server_id: 1; running (online) # - mysqld2: server_id: 2; stopped (offline) # +# NOTE: each CREATE INSTANCE statement must specify socket-file-name, otherwise +# this results of the test can be affected by another running test suite. +# ########################################################################### --source include/im_check_os.inc @@ -76,7 +79,10 @@ SET mysqld1.server_id = 11; # - start it; # - try to set/unset options; -CREATE INSTANCE mysqld3 datadir = '/'; +CREATE INSTANCE mysqld3 + datadir = '/', + server_id = 3, + socket = "$MYSQL_TMP_DIR/mysqld_3.sock"; START INSTANCE mysqld3; # FIXME: START INSTANCE should be synchronous. |