bk commit into 5.0 tree (istruewing:1.2255)

[ingo]

Below is the list of changes that have just been committed into a local
5.0 repository of istruewing. When istruewing 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-14 11:22:45+02:00, istruewing@stripped +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  chilla.local:/home/mydev/mysql-5.0--main
  MERGE: 1.2216.1.28

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2006-09-14 11:22:39+02:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.55.1.3

  sql/ha_ndbcluster.cc@stripped, 2006-09-14 11:22:39+02:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.273.2.1

  sql/sql_class.h@stripped, 2006-09-14 11:22:39+02:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.288.1.9

# 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:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.0--main/RESYNC

--- 1.293/sql/sql_class.h	2006-09-14 11:22:51 +02:00
+++ 1.294/sql/sql_class.h	2006-09-14 11:22:51 +02:00
@@ -342,6 +342,7 @@ public:
 		   bool need_mutex);
   int find_next_log(LOG_INFO* linfo, bool need_mutex);
   int get_current_log(LOG_INFO* linfo);
+  int raw_get_current_log(LOG_INFO* linfo);
   uint next_file_id();
   inline bool is_open() { return log_type != LOG_CLOSED; }
   inline char* get_index_fname() { return index_file_name;}

--- 1.56/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-09-14 11:22:51 +02:00
+++ 1.57/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-09-14 11:22:52 +02:00
@@ -8252,11 +8252,21 @@ void Dbdih::openingTableErrorLab(Signal*
   /*    WE FAILED IN OPENING A FILE. IF THE FIRST FILE THEN TRY WITH THE    */
   /*    DUPLICATE FILE, OTHERWISE WE REPORT AN ERROR IN THE SYSTEM RESTART. */
   /* ---------------------------------------------------------------------- */
-  ndbrequire(filePtr.i == tabPtr.p->tabFile[0]);
-  filePtr.i = tabPtr.p->tabFile[1];
-  ptrCheckGuard(filePtr, cfileFileSize, fileRecord);
-  openFileRw(signal, filePtr);
-  filePtr.p->reqStatus = FileRecord::OPENING_TABLE;
+  if (filePtr.i == tabPtr.p->tabFile[0])
+  {
+    filePtr.i = tabPtr.p->tabFile[1];
+    ptrCheckGuard(filePtr, cfileFileSize, fileRecord);
+    openFileRw(signal, filePtr);
+    filePtr.p->reqStatus = FileRecord::OPENING_TABLE;
+  }
+  else
+  {
+    char buf[256];
+    BaseString::snprintf(buf, sizeof(buf),
+			 "Error opening DIH schema files for table: %d",
+			 tabPtr.i);
+    progError(__LINE__, NDBD_EXIT_AFS_NO_SUCH_FILE, buf);
+  }
 }//Dbdih::openingTableErrorLab()
 
 void Dbdih::readingTableLab(Signal* signal, FileRecordPtr filePtr) 
@@ -8422,6 +8432,7 @@ Dbdih::resetReplicaSr(TabRecordPtr tabPt
       }
       replicaPtr.i = nextReplicaPtrI;
     }//while
+    updateNodeInfo(fragPtr);
   }
 }
 

--- 1.275/sql/ha_ndbcluster.cc	2006-09-14 11:22:52 +02:00
+++ 1.276/sql/ha_ndbcluster.cc	2006-09-14 11:22:52 +02:00
@@ -35,6 +35,7 @@
 // options from from mysqld.cc
 extern my_bool opt_ndb_optimized_node_selection;
 extern const char *opt_ndbcluster_connectstring;
+extern ulong opt_ndb_cache_check_time;
 
 // Default value for parallelism
 static const int parallelism= 0;
@@ -5238,6 +5239,7 @@ bool ndbcluster_init()
   pthread_cond_init(&COND_ndb_util_thread, NULL);
 
 
+  ndb_cache_check_time = opt_ndb_cache_check_time;
   // Create utility thread
   pthread_t tmp;
   if (pthread_create(&tmp, &connection_attrib, ndb_util_thread_func, 0))