diff options
| author | unknown <konstantin@mysql.com> | 2006-06-26 18:45:46 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-06-26 18:45:46 +0400 |
| commit | fee803af179a3adc89f5e87511489bf44df527dd (patch) | |
| tree | 83857837ef8ba671f8533131cf5fb0bdbe65f750 /mysql-test/t/im_options.imtest | |
| parent | a5e194ed526f6974bddc9e847f13d6a431e30b37 (diff) | |
| parent | 42169376f04a575fc5b21d8c57974493a6444d5e (diff) | |
| download | mariadb-git-fee803af179a3adc89f5e87511489bf44df527dd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/opt/local/work/mysql-5.1-runtime
mysql-test/r/information_schema.result:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/events.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/events_microsec.test:
SCCS merged
Diffstat (limited to 'mysql-test/t/im_options.imtest')
| -rw-r--r-- | mysql-test/t/im_options.imtest | 10 |
1 files changed, 8 insertions, 2 deletions
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. |