bk commit into 5.0 tree (tomas:1.2130)

[tomas]

Below is the list of changes that have just been committed into a local
5.0 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.2130 06/06/14 13:00:15 tomas@stripped +1 -0
  Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
  into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

  sql/ha_ndbcluster.cc
    1.248 06/06/14 13:00:10 tomas@stripped +5 -6
    manual merge

# 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.0/RESYNC

--- 1.247/sql/ha_ndbcluster.cc	2006-05-15 20:29:44 +02:00
+++ 1.248/sql/ha_ndbcluster.cc	2006-06-14 13:00:10 +02:00
@@ -4344,15 +4344,29 @@
 
 int ha_ndbcluster::drop_table()
 {
+  THD *thd= current_thd;
   Ndb *ndb= get_ndb();
   NdbDictionary::Dictionary *dict= ndb->getDictionary();
 
   DBUG_ENTER("drop_table");
   DBUG_PRINT("enter", ("Deleting %s", m_tabname));
-
+  
   release_metadata();
-  if (dict->dropTable(m_tabname))
+  while (dict->dropTable(m_tabname)) 
+  {
+    const NdbError err= dict->getNdbError();
+    switch (err.status)
+    {
+      case NdbError::TemporaryError:
+        if (!thd->killed)
+          continue; // retry indefinitly
+        break;
+      default:
+        break;
+    }
     ERR_RETURN(dict->getNdbError());
+  }
+
   DBUG_RETURN(0);
 }
 
@@ -4761,14 +4775,24 @@
   List_iterator_fast<char> it(drop_list);
   while ((tabname=it++))
   {
-    if (dict->dropTable(tabname))
+    while (dict->dropTable(tabname))
     {
       const NdbError err= dict->getNdbError();
-      if (err.code != 709)
+      switch (err.status)
+      {
+        case NdbError::TemporaryError:
+          if (!thd->killed)
+            continue; // retry indefinitly
+          break;
+        default:
+          break;
+      }
+      if (err.code != 709) // 709: No such table existed
       {
         ERR_PRINT(err);
         ret= ndb_to_mysql_error(&err);
       }
+      break;
     }
   }
   DBUG_RETURN(ret);