bk commit into 5.1 tree (tomas:1.2160)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2160 06/05/19 18:11:47 tomas@stripped +1 -0
  ndb: moved startup order back for ndb binlog thread from previous push that seems to be
causing startup issues

  sql/ha_ndbcluster_binlog.cc
    1.59 06/05/19 18:11:39 tomas@stripped +14 -12
    ndb: moved startup order back for ndb binlog thread from previous push that seems to
be causing startup issues

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new-ndb

--- 1.58/sql/ha_ndbcluster_binlog.cc	2006-05-19 17:34:42 +02:00
+++ 1.59/sql/ha_ndbcluster_binlog.cc	2006-05-19 18:11:39 +02:00
@@ -3284,21 +3284,10 @@
   pthread_mutex_unlock(&injector_mutex);
   pthread_cond_signal(&injector_cond);
 
+restart:
   /*
     Main NDB Injector loop
   */
-
-  DBUG_ASSERT(ndbcluster_hton.slot != ~(uint)0);
-  if (!(thd_ndb= ha_ndbcluster::seize_thd_ndb()))
-  {
-    sql_print_error("Could not allocate Thd_ndb object");
-    goto err;
-  }
-  set_thd_ndb(thd, thd_ndb);
-  thd_ndb->options|= TNO_NO_LOG_SCHEMA_OP;
-  thd->query_id= 0; // to keep valgrind quiet
-
-restart:
   {
     thd->proc_info= "Waiting for ndbcluster to start";
 
@@ -3317,6 +3306,19 @@
       }
     }
     pthread_mutex_unlock(&injector_mutex);
+
+    if (thd_ndb == NULL)
+    {
+      DBUG_ASSERT(ndbcluster_hton.slot != ~(uint)0);
+      if (!(thd_ndb= ha_ndbcluster::seize_thd_ndb()))
+      {
+        sql_print_error("Could not allocate Thd_ndb object");
+        goto err;
+      }
+      set_thd_ndb(thd, thd_ndb);
+      thd_ndb->options|= TNO_NO_LOG_SCHEMA_OP;
+      thd->query_id= 0; // to keep valgrind quiet
+    }
   }
 
   {