Commit 5b6ff37b authored Nov 07, 2006 by unknown

Merge bk-internal:/home/bk/mysql-5.1-new-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint

parents 29c61445 42364346

mysql-test/r/im_daemon_life_cycle.result

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

mysql-test/t/im_daemon_life_cycle.imtest

+4 −1

Original line number	Diff line number	Diff line
		@@ -46,10 +46,13 @@ 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.

		# Give some time to begin accepting connections after restart.