bk commit into 5.1 tree (jonas:1.2438)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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, 2007-02-15 23:18:41+01:00, jonas@stripped +2 -0
  Merge joreland@stripped:/home/bk/mysql-5.1-telco
  into  perch.ndb.mysql.com:/home/jonas/src/51-telco
  MERGE: 1.2414.24.1

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-02-15 23:18:37+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.137.1.1

  storage/ndb/test/run-test/main.cpp@stripped, 2007-02-15 23:18:37+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.29.1.2

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-telco/RESYNC

--- 1.138/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-02-15 23:18:45 +01:00
+++ 1.139/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-02-15 23:18:45 +01:00
@@ -4257,7 +4257,7 @@
 	   signal->theData, sizeof(Local_key));
     regTcPtr.p->m_nr_delete.m_page_id[pos] = RNIL;
     regTcPtr.p->m_nr_delete.m_cnt = pos + 2;
-    ndbout << "PENDING DISK DELETE: " << 
+    if (0) ndbout << "PENDING DISK DELETE: " << 
       regTcPtr.p->m_nr_delete.m_disk_ref[pos] << endl;
   }
   
@@ -7575,7 +7575,7 @@
 	       * THE RECEIVER OF THE COPY HAVE FAILED. 
 	       * WE HAVE TO CLOSE THE COPY PROCESS. 
 	       * ----------------------------------------------------------- */
-	      ndbout_c("close copy");
+	      if (0) ndbout_c("close copy");
               tcConnectptr.p->tcNodeFailrec = tcNodeFailptr.i;
               tcConnectptr.p->abortState = TcConnectionrec::NEW_FROM_TC;
               closeCopyRequestLab(signal);
@@ -10838,7 +10838,7 @@
 void Dblqh::closeCopyRequestLab(Signal* signal) 
 {
   scanptr.p->scanErrorCounter++;
-  ndbout_c("closeCopyRequestLab: scanState: %d", scanptr.p->scanState);
+  if (0) ndbout_c("closeCopyRequestLab: scanState: %d", scanptr.p->scanState);
   switch (scanptr.p->scanState) {
   case ScanRecord::WAIT_TUPKEY_COPY:
   case ScanRecord::WAIT_NEXT_SCAN_COPY:

--- 1.31/storage/ndb/test/run-test/main.cpp	2007-02-15 23:18:45 +01:00
+++ 1.32/storage/ndb/test/run-test/main.cpp	2007-02-15 23:18:45 +01:00
@@ -239,11 +239,8 @@
       if(!stop_processes(g_config, ~0))
 	goto end;
       
-      if (!setup_directories(g_config, 2))
-	goto end;
-      
-      if (!setup_files(g_config, 2, 1))
-	goto end;
+      if(!setup_hosts(g_config))
+        goto end;
       
       if (!start(g_config, p_ndb | p_servers))
 	goto end;
@@ -1070,14 +1067,14 @@
     tmp.appfmt(" %s:%s/*", 
 	       config.m_hosts[i]->m_hostname.c_str(),
 	       config.m_hosts[i]->m_basedir.c_str());
-    
-    g_logger.debug("system(%s)", tmp.c_str());
-    const int r1 = system(tmp.c_str());
-    if(r1 != 0)
-    {
-      g_logger.critical("Failed to gather result!");
-      return false;
-    }
+  }
+
+  g_logger.debug("system(%s)", tmp.c_str());
+  const int r1 = system(tmp.c_str());
+  if(r1 != 0)
+  {
+    g_logger.critical("Failed to gather result!");
+    return false;
   }
   
   g_logger.debug("system(%s)", g_analyze_progname);