bk commit into 5.1 tree (anozdrin:1.2231)

[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.2231 06/06/21 02:16:38 anozdrin@stripped +1 -0
  Fix merge 5.0 -> 5.1.

  mysql-test/r/im_life_cycle.result
    1.10 06/06/21 02:16:34 anozdrin@stripped +0 -4
    Fix manual merge.

# 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:	booka.site
# Root:	/home/alik/MySQL/devel/5.1-merged

--- 1.9/mysql-test/r/im_life_cycle.result	2006-06-20 18:28:24 +04:00
+++ 1.10/mysql-test/r/im_life_cycle.result	2006-06-21 02:16:34 +04:00
@@ -47,10 +47,6 @@ mysqld2	offline
 Killing the process...
 Sleeping...
 Success: the process was restarted.
-
---------------------------------------------------------------------
--- 1.1.7.
---------------------------------------------------------------------
 SHOW INSTANCES;
 instance_name	state
 mysqld1	online