Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-build

into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-build


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Merged.

mysql-test/mysql-test-run.pl

@@ -3008,7 +3008,7 @@ language            = $path_language
 character-sets-dir  = $path_charsetsdir
 basedir             = $path_my_basedir
 server_id           = $server_id
-shutdown-delay      = 10
+shutdown_delay      = 10
 skip-stack-trace
 skip-innodb
 skip-ndbcluster

mysql-test/r/im_daemon_life_cycle.result

@@ -21,6 +21,6 @@ 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
+mysqld1	STATE	VERSION_NUMBER	VERSION	no
 STOP INSTANCE mysqld2;
 Success: the process has been stopped.