From a28e7eb4206d74d43eb476360eaa67a6b64b0164 Mon Sep 17 00:00:00 2001
From: unknown <anozdrin@mysql.com>
Date: Wed, 21 Jun 2006 02:16:38 +0400
Subject: [PATCH] Fix merge 5.0 -> 5.1.

mysql-test/r/im_life_cycle.result:
  Fix manual merge.
---
 mysql-test/r/im_life_cycle.result | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mysql-test/r/im_life_cycle.result b/mysql-test/r/im_life_cycle.result
index aa26b355aff..b6d3bb8361c 100644
--- 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