bk commit into 5.1 tree (stewart:1.1883)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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.1883 05/05/26 12:52:57 stewart@stripped +2 -0
  Merge ssmith@stripped:/home/bk/mysql-5.1-wl2325
  into mysql.com:/home/stewart/Documents/MySQL/5.1/wl2325

  sql/handler.cc
    1.170 05/05/26 12:52:53 stewart@stripped +0 -0
    Auto merged

  sql/ha_ndbcluster.cc
    1.256 05/05/26 12:52:53 stewart@stripped +0 -0
    Auto merged

# 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:	stewart
# Host:	kennedy.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/wl2325/RESYNC

--- 1.169/sql/handler.cc	2005-05-26 02:55:57 +10:00
+++ 1.170/sql/handler.cc	2005-05-26 12:52:53 +10:00
@@ -452,6 +452,10 @@
 int ha_panic(enum ha_panic_function flag)
 {
   int error=0;
+#ifdef HAVE_NDBCLUSTER_DB
+  if (have_ndbcluster == SHOW_OPTION_YES)
+    error|=ndbcluster_end();
+#endif
 #ifndef NO_HASH
   error|=h_panic(flag);			/* fix hash */
 #endif
@@ -469,10 +473,6 @@
 #ifdef HAVE_INNOBASE_DB
   if (have_innodb == SHOW_OPTION_YES)
     error|=innobase_end();
-#endif
-#ifdef HAVE_NDBCLUSTER_DB
-  if (have_ndbcluster == SHOW_OPTION_YES)
-    error|=ndbcluster_end();
 #endif
 #ifdef HAVE_FEDERATED_DB
   if (have_federated_db == SHOW_OPTION_YES)

--- 1.255/sql/ha_ndbcluster.cc	2005-05-26 02:55:56 +10:00
+++ 1.256/sql/ha_ndbcluster.cc	2005-05-26 12:52:53 +10:00
@@ -5479,6 +5479,12 @@
   (void) pthread_mutex_unlock(&LOCK_ndb_util_thread);
 
 #ifdef HAVE_REPLICATION
+  // wait for injector thread to finish
+  pthread_mutex_lock(&injector_mutex);
+  while(ndb_injector_thread_running>0)
+    pthread_cond_wait(&injector_cond,&injector_mutex);
+  pthread_mutex_unlock(&injector_mutex);
+
   /* remove all shares */
   {
     pthread_mutex_lock(&ndbcluster_mutex);
@@ -9439,7 +9445,7 @@
   } // for(;;)
   }
 err:
-  //close_thread_tables(thd);
+  close_thread_tables(thd);
   pthread_mutex_lock(&injector_mutex);
   /* don't mess with the injector_ndb anymore from other threads */
   injector_ndb= 0;