Commit a28e7eb4 authored by unknown's avatar unknown
Browse files

Fix merge 5.0 -> 5.1.


mysql-test/r/im_life_cycle.result:
  Fix manual merge.
parent d1e45ad8
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -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