bk commit into 5.0 tree (anozdrin:1.2145) BUG#19391

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.0 repository of alik. When alik does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2145 06/05/29 15:18:25 anozdrin@stripped +1 -0
  Fix for BUG#19391: IM fails to start after two executions

  server-tools/instance-manager/manager.cc
    1.33 06/05/29 15:18:22 anozdrin@stripped +19 -19
    Start Listener-thread after all initialization.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	anozdrin
# Host:	station.home
# Root:	/mnt/raid/MySQL/devel/5.0-rt-bug19391

--- 1.32/server-tools/instance-manager/manager.cc	2006-05-06 13:57:53 +04:00
+++ 1.33/server-tools/instance-manager/manager.cc	2006-05-29 15:18:22 +04:00
@@ -150,25 +150,6 @@
   sigset_t mask;
   set_signals(&mask);
 
-  /* create the listener */
-  {
-    pthread_t listener_thd_id;
-    pthread_attr_t listener_thd_attr;
-    int rc;
-
-    pthread_attr_init(&listener_thd_attr);
-    pthread_attr_setdetachstate(&listener_thd_attr, PTHREAD_CREATE_DETACHED);
-    rc= set_stacksize_n_create_thread(&listener_thd_id, &listener_thd_attr,
-                                      listener, &listener_args);
-    pthread_attr_destroy(&listener_thd_attr);
-    if (rc)
-    {
-      log_error("manager(): set_stacksize_n_create_thread(listener) failed");
-      goto err;
-    }
-
-  }
-
   /* create guardian thread */
   {
     pthread_t guardian_thd_id;
@@ -209,6 +190,25 @@
                "the wrong config file options. For instance, missing mysqld "
                "binary. Aborting.");
     return;
+  }
+
+  /* create the listener */
+  {
+    pthread_t listener_thd_id;
+    pthread_attr_t listener_thd_attr;
+    int rc;
+
+    pthread_attr_init(&listener_thd_attr);
+    pthread_attr_setdetachstate(&listener_thd_attr, PTHREAD_CREATE_DETACHED);
+    rc= set_stacksize_n_create_thread(&listener_thd_id, &listener_thd_attr,
+                                      listener, &listener_args);
+    pthread_attr_destroy(&listener_thd_attr);
+    if (rc)
+    {
+      log_error("manager(): set_stacksize_n_create_thread(listener) failed");
+      goto err;
+    }
+
   }
 
   /*