Fix merge 5.0 -> 5.1.

mysql-test/r/im_life_cycle.result: Fix manual merge.

Fix merge 5.0 -> 5.1.
mysql-test/r/im_life_cycle.result: Fix manual merge.
6afc9c86 · unknown · 6b31ac40 · 6afc9c86
Commit 6afc9c86 authored Jun 21, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

mysql-test/r/im_life_cycle.result mysql-test/r/im_life_cycle.result +0 -4

No files found.
--- a/mysql-test/r/im_life_cycle.result
+++ b/mysql-test/r/im_life_cycle.result
@@ -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