bk commit into 5.1 tree (jonas:1.2425)

[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-21 14:32:23+01:00, jonas@stripped +4 -0
  ndb - 
    remove some debug printouts
    backport to 6.1.*

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-02-21 14:32:21+01:00, jonas@stripped +3 -3
    remove some debug printouts

  storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp@stripped, 2007-02-21 14:32:21+01:00, jonas@stripped +2 -2
    remove some debug printouts

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp@stripped, 2007-02-21 14:32:21+01:00, jonas@stripped +1 -1
    remove some debug printouts

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@stripped, 2007-02-21 14:32:21+01:00, jonas@stripped +4 -4
    remove some debug printouts

# 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/telco-6.1

--- 1.135/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-02-21 14:32:29 +01:00
+++ 1.136/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-02-21 14:32:29 +01:00
@@ -4236,7 +4236,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;
   }
   
@@ -7551,7 +7551,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);
@@ -10809,7 +10809,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.14/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp	2007-02-21 14:32:29 +01:00
+++ 1.15/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp	2007-02-21 14:32:29 +01:00
@@ -145,7 +145,7 @@
     {
       if(copy_bits & Tuple_header::MM_GROWN)
       {
-	ndbout_c("abort grow");
+	if (0) ndbout_c("abort grow");
 	Ptr<Page> vpage;
 	Uint32 idx= regOperPtr.p->m_tuple_location.m_page_idx;
 	Uint32 mm_vars= regTabPtr.p->m_attributes[MM].m_no_of_varsize;
@@ -168,7 +168,7 @@
       } 
       else if(bits & Tuple_header::MM_SHRINK)
       {
-	ndbout_c("abort shrink");
+	if (0) ndbout_c("abort shrink");
       }
     }
     else if (regOperPtr.p->is_first_operation() && 

--- 1.21/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2007-02-21 14:32:29 +01:00
+++ 1.22/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2007-02-21 14:32:29 +01:00
@@ -514,7 +514,7 @@
 	
 	c_lgman->free_log_space(regFragPtr.p->m_logfile_group_id, 
 				regOperPtr.p->m_undo_buffer_space);
-	ndbout_c("insert+delete");
+	if (0) ndbout_c("insert+delete");
 	goto skip_disk;
       }
     } 

--- 1.51/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2007-02-21 14:32:29 +01:00
+++ 1.52/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2007-02-21 14:32:29 +01:00
@@ -2857,7 +2857,7 @@
     if(needed <= alloc)
     {
       //ndbassert(!regOperPtr->is_first_operation());
-      ndbout_c(" no grow");
+      if (0) ndbout_c(" no grow");
       return 0;
     }
     copy_bits |= Tuple_header::MM_GROWN;
@@ -3143,7 +3143,7 @@
       break;
     }
 
-    ndbout << "DIRECT DISK DELETE: " << disk << endl;
+    if (0) ndbout << "DIRECT DISK DELETE: " << disk << endl;
     disk_page_free(signal, tablePtr.p, fragPtr.p,
 		   &disk, *(PagePtr*)&disk_page, gci);
     return 0;
@@ -3195,7 +3195,7 @@
     break;
   }
     
-  ndbout << "PAGE CALLBACK DISK DELETE: " << op.m_disk_ref << endl;
+  if (0) ndbout << "PAGE CALLBACK DISK DELETE: " << op.m_disk_ref << endl;
   disk_page_free(signal, tablePtr.p, fragPtr.p,
 		 &op.m_disk_ref, pagePtr, op.m_gci);
   
@@ -3227,7 +3227,7 @@
   /**
    * reset page no
    */
-  ndbout << "LOGBUFFER CALLBACK DISK DELETE: " << op.m_disk_ref << endl;
+  if (0) ndbout << "LOGBUFFER CALLBACK DISK DELETE: " << op.m_disk_ref << endl;
   
   disk_page_free(signal, tablePtr.p, fragPtr.p,
 		 &op.m_disk_ref, pagePtr, op.m_gci);