bk commit into 5.1 tree (anozdrin:1.2237) BUG#20294

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of alik. When alik does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2237 06/06/22 18:56:22 anozdrin@stripped +3 -0
  Additional fix for BUG#20294: Instance manager test
  im_instance_conf fails randomly.

  mysql-test/t/im_options.imtest
    1.2 06/06/22 18:56:19 anozdrin@stripped +8 -2
    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.

  mysql-test/t/im_instance_conf.imtest
    1.3 06/06/22 18:56:19 anozdrin@stripped +3 -0
    Added a note about specific of CREATE INSTANCE usage in IM-tests.

  mysql-test/r/im_options.result
    1.3 06/06/22 18:56:19 anozdrin@stripped +6 -1
    Updated result file.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	anozdrin
# Host:	alik.
# Root:	/mnt/raid/alik/MySQL/devel/5.1-rt-bug20294

--- 1.2/mysql-test/r/im_options.result	2006-05-22 15:20:37 +04:00
+++ 1.3/mysql-test/r/im_options.result	2006-06-22 18:56:19 +04:00
@@ -13,7 +13,10 @@
 ERROR HY000: The instance is active. Stop the instance first
 SET mysqld1.server_id = 11;
 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;
 UNSET mysqld3.server_id;
 ERROR HY000: The instance is active. Stop the instance first
@@ -101,12 +104,14 @@
 --------------------------------------------------------------------
 server_id           = 1
 server_id=2
+server_id=3
 --------------------------------------------------------------------
 UNSET mysqld2.server_id, mysqld3.server_id, mysqld1.ccc;
 ERROR HY000: The instance is active. Stop the instance first
 --------------------------------------------------------------------
 server_id           = 1
 server_id=2
+server_id=3
 --------------------------------------------------------------------
 DROP INSTANCE mysqld3;
 SET mysqld2.server_id=222;

--- 1.2/mysql-test/t/im_instance_conf.imtest	2006-06-21 16:02:48 +04:00
+++ 1.3/mysql-test/t/im_instance_conf.imtest	2006-06-22 18:56:19 +04:00
@@ -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

--- 1.1/mysql-test/t/im_options.imtest	2006-05-18 18:57:46 +04:00
+++ 1.2/mysql-test/t/im_options.imtest	2006-06-22 18:56:19 +04:00
@@ -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 @@
 #   - 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.