From: Date: May 10 2006 12:34pm
Subject: bk commit into 5.0 tree (anozdrin:1.2121) BUG#14106
List-Archive: http://lists.mysql.com/commits/6187
X-Bug: 14106
Message-Id: <20060510103408.66E45EC56@station.home>

Below is the list of changes that have just been committed into a local
5.0 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.2121 06/05/10 14:34:03 anozdrin@stripped +2 -0
  Commit forgotten changes for BUG#14106.

  mysql-test/r/im_options_unset.result
    1.2 06/05/10 14:34:00 anozdrin@stripped +3 -3
    Fixed result file.

  mysql-test/r/im_options_set.result
    1.2 06/05/10 14:34:00 anozdrin@stripped +3 -3
    Fixed 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:	station.home
# Root:	/mnt/raid/MySQL/devel/5.0-bug14106

--- 1.1/mysql-test/r/im_options_set.result	2005-10-01 01:14:37 +04:00
+++ 1.2/mysql-test/r/im_options_set.result	2006-05-10 14:34:00 +04:00
@@ -1,11 +1,11 @@
-server_id           =1
-server_id           =2
+server_id           = 1
+server_id           = 2
 SHOW VARIABLES LIKE 'server_id';
 Variable_name	Value
 server_id	1
 SET mysqld1.server_id = 11;
 server_id =11
-server_id           =2
+server_id           = 2
 SHOW VARIABLES LIKE 'server_id';
 Variable_name	Value
 server_id	1

--- 1.1/mysql-test/r/im_options_unset.result	2005-10-01 01:14:37 +04:00
+++ 1.2/mysql-test/r/im_options_unset.result	2006-05-10 14:34:00 +04:00
@@ -1,10 +1,10 @@
-server_id           =1
-server_id           =2
+server_id           = 1
+server_id           = 2
 SHOW VARIABLES LIKE 'server_id';
 Variable_name	Value
 server_id	1
 UNSET mysqld1.server_id;
-server_id           =2
+server_id           = 2
 SHOW VARIABLES LIKE 'server_id';
 Variable_name	Value
 server_id	1