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

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


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/t/disabled.def:
  Merge: enabled im_daemon_life_cycle.imtest
mysql-test/t/view.test:
  Manual merge.
server-tools/instance-manager/listener.cc:
  Manual merge.
server-tools/instance-manager/manager.cc:
  Manual merge.
server-tools/instance-manager/manager.h:
  Manual merge.
server-tools/instance-manager/mysqlmanager.cc:
  Manual merge.
server-tools/instance-manager/thread_registry.cc:
  Manual merge.
server-tools/instance-manager/thread_registry.h:
  Manual merge.

1 files changed, 4 insertions, 4 deletions

diff --git a/server-tools/instance-manager/manager.cc b/server-tools/instance-manager/manager.cc
index 48dfa4c3571..bde685d7a28 100644
--- a/server-tools/instance-manager/manager.cc
+++ b/server-tools/instance-manager/manager.cc
@@ -181,6 +181,9 @@ void Manager::stop_all_threads()
 
   /* Stop all threads. */
   p_thread_registry->deliver_shutdown();
+
+  /* Set error status in the thread registry. */
+  p_thread_registry->set_error_status();
 }
 
 
@@ -248,7 +251,6 @@ bool Manager::init_user_map(User_map *user_map)
 
 int Manager::main()
 {
-  int rc= 1;
   bool shutdown_complete= FALSE;
   pid_t manager_pid= getpid();
 
@@ -442,8 +444,6 @@ int Manager::main()
 
   log_info("Manager: finished.");
 
-  rc= 0;
-
 err:
   /* delete the pid file */
   my_delete(Options::Main::pid_file_name, MYF(0));
@@ -452,7 +452,7 @@ err:
   /* free alarm structures */
   end_thr_alarm(1);
 #endif
-  return rc;
+  return thread_registry.get_error_status() ? 1 : 0;
 }