1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Fix merge 5.0 -> 5.1.

mysql-test/r/im_life_cycle.result:
  Fix manual merge.
This commit is contained in:
unknown
2006-06-21 02:16:38 +04:00
parent d1e45ad8f8
commit a28e7eb420

View File

@ -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