bk commit into 5.1 tree (msvensson:1.2343)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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@stripped, 2006-11-07 10:46:49+01:00, msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.1810.1698.163

  mysql-test/r/im_daemon_life_cycle.result@stripped, 2006-11-07 10:46:45+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.2.1.6

  mysql-test/t/im_daemon_life_cycle.imtest@stripped, 2006-11-07 10:46:45+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.1.1.7

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.9/mysql-test/r/im_daemon_life_cycle.result	2006-11-07 10:46:54 +01:00
+++ 1.10/mysql-test/r/im_daemon_life_cycle.result	2006-11-07 10:46:54 +01:00
@@ -18,6 +18,7 @@ Success: the process has been started.
 Killing the process...
 Sleeping...
 Success: the process was restarted.
+Success: server is ready to accept connection on socket.
 SHOW INSTANCE STATUS mysqld1;
 instance_name	state	version_number	version	mysqld_compatible
 mysqld1	online	VERSION_NUMBER	VERSION	no

--- 1.10/mysql-test/t/im_daemon_life_cycle.imtest	2006-11-07 10:46:54 +01:00
+++ 1.11/mysql-test/t/im_daemon_life_cycle.imtest	2006-11-07 10:46:54 +01:00
@@ -46,9 +46,12 @@ START INSTANCE mysqld2;
 # FIXME: START INSTANCE should be synchronous.
 --exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started
 
-# 2. Restart IM-main: kill it and IM-angel will restart it.
+# 2. Restart IM-main: kill it and IM-angel will restart it; wait for IM to
+# start accepting connections again.
 
 --exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_PATH_PID restarted 30
+
+--exec $MYSQL_TEST_DIR/t/wait_for_socket.sh $EXE_MYSQL $IM_PATH_SOCK $IM_USERNAME $IM_PASSWORD '' 30
 
 # 3. Issue some statement -- connection should be re-established.