bk commit into 5.0 tree (dli:1.2256)

[David Li]

Below is the list of changes that have just been committed into a local
5.0 repository of dli. When dli 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@stripped, 2006-09-28 20:06:18+08:00, dli@stripped +6 -0
  Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-bug-19651
  into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-19651
  MERGE: 1.1616.2144.184

  ndb/include/util/ndb_opts.h@stripped, 2006-09-28 20:06:00+08:00, dli@stripped +0 -1
    C
    MERGE: 1.4.1.4

  ndb/test/ndbapi/flexScan.cpp@stripped, 2006-09-28 19:54:51+08:00, dli@stripped +0 -2
    Auto merged
    MERGE: 1.9.1.1

  ndb/tools/ndb_config.cpp@stripped, 2006-09-28 19:54:51+08:00, dli@stripped +0 -1
    Auto merged
    MERGE: 1.3.2.3

  ndb/tools/restore/consumer_restore.cpp@stripped, 2006-09-28 19:54:51+08:00, dli@stripped +0 -0
    Auto merged
    MERGE: 1.9.1.5

  ndb/tools/restore/consumer_restore.hpp@stripped, 2006-09-28 19:54:51+08:00, dli@stripped +0 -0
    Auto merged
    MERGE: 1.7.1.1

  ndb/tools/restore/restore_main.cpp@stripped, 2006-09-28 19:54:51+08:00, dli@stripped +0 -0
    Auto merged
    MERGE: 1.25.1.4

# 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:	dli
# Host:	dev3-76.dev.cn.tlan
# Root:	/home/dli/mysql/mysql-5.0/mysql-5.0-bug-19651/RESYNC

--- 1.34/ndb/tools/restore/restore_main.cpp	2006-09-28 20:06:24 +08:00
+++ 1.35/ndb/tools/restore/restore_main.cpp	2006-09-28 20:06:24 +08:00
@@ -430,6 +430,17 @@
       }
     }
   }
+  for(Uint32 i= 0; i < g_consumers.size(); i++) 
+  {
+    if (g_consumers[i]->has_temp_error())
+    {
+      clearConsumers();
+      ndbout_c("\nRestore successful, but encountered temporary error, "
+               "please look at configuration.");
+      return NDBT_ProgramExit(NDBT_TEMPORARY);
+    }
+  }
+
   clearConsumers();
   return NDBT_ProgramExit(NDBT_OK);
 } // main

--- 1.25/ndb/tools/restore/consumer_restore.cpp	2006-09-28 20:06:24 +08:00
+++ 1.26/ndb/tools/restore/consumer_restore.cpp	2006-09-28 20:06:24 +08:00
@@ -180,6 +180,11 @@
 }
 
 bool
+BackupRestore::has_temp_error(){
+  return m_temp_error;
+}
+
+bool
 BackupRestore::table(const TableS & table){
   if (!m_restore && !m_restore_meta)
     return true;
@@ -485,6 +490,7 @@
     
   case NdbError::TemporaryError:
     err << "Temporary error: " << error << endl;
+    m_temp_error = true;
     NdbSleep_MilliSleep(sleepTime);
     return true;
     // RETRY

--- 1.9/ndb/tools/restore/consumer_restore.hpp	2006-09-28 20:06:24 +08:00
+++ 1.10/ndb/tools/restore/consumer_restore.hpp	2006-09-28 20:06:24 +08:00
@@ -42,6 +42,7 @@
     m_parallelism = parallelism;
     m_callback = 0;
     m_free_callback = 0;
+    m_temp_error = false;
     m_transactions = 0;
     m_cache.m_old_table = 0;
   }
@@ -61,6 +62,7 @@
   virtual void logEntry(const LogEntry &);
   virtual void endOfLogEntrys();
   virtual bool finalize_table(const TableS &);
+  virtual bool has_temp_error();
   void connectToMysql();
   Ndb * m_ndb;
   Ndb_cluster_connection * m_cluster_connection;
@@ -74,6 +76,7 @@
 
   restore_callback_t *m_callback;
   restore_callback_t *m_free_callback;
+  bool m_temp_error;
 
   /**
    * m_new_table_ids[X] = Y;