database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Additional fix for BUG#20294: Instance manager test

Browse Source 
im_instance_conf fails randomly.
This commit is contained in:
anozdrin@mysql.com
2006-06-22 18:56:22 +04:00
parent 6ed2ec688d
commit d5dca744cd
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/im_options.result
View File

@@ -13,7 +13,10 @@ UNSET mysqld1.server_id;
ERROR HY000: The instance is active. Stop the instance first ERROR HY000: The instance is active. Stop the instance first
SET mysqld1.server_id = 11; SET mysqld1.server_id = 11;
ERROR HY000: The instance is active. Stop the instance first ERROR HY000: The instance is active. Stop the instance first
CREATE INSTANCE mysqld3 datadir = '/'; CREATE INSTANCE mysqld3
datadir = '/',
server_id = 3,
socket = "$MYSQL_TMP_DIR/mysqld_3.sock";
START INSTANCE mysqld3; START INSTANCE mysqld3;
UNSET mysqld3.server_id; UNSET mysqld3.server_id;
ERROR HY000: The instance is active. Stop the instance first ERROR HY000: The instance is active. Stop the instance first
@@ -101,12 +104,14 @@ ERROR HY000: Bad instance name. Check that the instance with such a name exists
-------------------------------------------------------------------- --------------------------------------------------------------------
server_id = 1 server_id = 1
server_id=2 server_id=2
server_id=3
-------------------------------------------------------------------- --------------------------------------------------------------------
UNSET mysqld2.server_id, mysqld3.server_id, mysqld1.ccc; UNSET mysqld2.server_id, mysqld3.server_id, mysqld1.ccc;
ERROR HY000: The instance is active. Stop the instance first ERROR HY000: The instance is active. Stop the instance first
-------------------------------------------------------------------- --------------------------------------------------------------------
server_id = 1 server_id = 1
server_id=2 server_id=2
server_id=3
-------------------------------------------------------------------- --------------------------------------------------------------------
DROP INSTANCE mysqld3; DROP INSTANCE mysqld3;
SET mysqld2.server_id=222; SET mysqld2.server_id=222;

3
mysql-test/t/im_instance_conf.imtest
View File

@@ -21,6 +21,9 @@
# - DROP INSTANCE fails for active instance. # - DROP INSTANCE fails for active instance.
# - DROP INSTANCE updates both config file and internal configuration cache; # - 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 --source include/im_check_os.inc

10
mysql-test/t/im_options.imtest
View File

@@ -21,12 +21,15 @@
# - server_id # - server_id
# - port # - port
# - nonguarded # - nonguarded
#
# Let's test SET statement on the option 'server_id'. It's expected that # Let's test SET statement on the option 'server_id'. It's expected that
# originally the instances have the following server ids and states: # originally the instances have the following server ids and states:
# - mysqld1: server_id: 1; running (online) # - mysqld1: server_id: 1; running (online)
# - mysqld2: server_id: 2; stopped (offline) # - 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 --source include/im_check_os.inc
@@ -76,7 +79,10 @@ SET mysqld1.server_id = 11;
# - start it; # - start it;
# - try to set/unset options; # - 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; START INSTANCE mysqld3;
# FIXME: START INSTANCE should be synchronous. # FIXME: START INSTANCE should be synchronous.