bk commit into 5.1 tree (jonas:1.1995)

[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
  1.1995 05/09/08 18:20:18 jonas@eel.(none) +3 -0
  ndb diskdata 
    enable expand during restore LCP

  storage/ndb/tools/select_all.cpp
    1.25 05/09/08 18:20:14 jonas@eel.(none) +6 -1
    add option to perform tupscan instead of acc scan

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.98 05/09/08 18:20:14 jonas@eel.(none) +30 -0
    enable expand during restore LCP

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.66 05/09/08 18:20:14 jonas@eel.(none) +2 -2
    enable expand during restore LCP

# 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:	eel.(none)
# Root:	/home/jonas/src/mysql-5.1-ndb-dd

--- 1.65/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2005-09-06 20:47:08 +02:00
+++ 1.66/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2005-09-08 18:20:14 +02:00
@@ -4545,7 +4545,7 @@
     /**
      * Hmm... this means that it's alreay has been reenabled...
      */
-    ndbassert(false);
+    fragrecptr.p->expandFlag = 1;
     break;
   case 1:
     /**
@@ -5313,7 +5313,7 @@
    *
    * Is later restored to 0 by LQH at end of REDO log execution
    */
-  regFragPtr.p->expandFlag = (getNodeState().getSystemRestartInProgress()?1:0);
+  regFragPtr.p->expandFlag = 0;
   regFragPtr.p->p = 0;
   regFragPtr.p->maxp = (1 << req->kValue) - 1;
   regFragPtr.p->minloadfactor = minLoadFactor;

--- 1.97/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2005-09-06 12:58:32 +02:00
+++ 1.98/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2005-09-08 18:20:14 +02:00
@@ -12714,6 +12714,20 @@
      *   RESTORE_LCP_REQ will currently restore all fragments
      */
     c_lcp_complete_fragments.add(fragptr);
+
+    if(lcpNo == ZNIL)
+    {
+      for (Uint32 i = 0; i<MAX_FRAG_PER_NODE; i++)
+      {
+	if (tabptr.p->fragrec[i] != RNIL)
+	{
+	  signal->theData[0] = tabptr.i;
+	  signal->theData[1] = tabptr.p->fragid[i];
+	  sendSignal(DBACC_REF, GSN_EXPANDCHECK2, signal, 2, JBB);
+	}
+      }
+    }
+    
     return;
   }//if
 
@@ -12772,6 +12786,22 @@
   c_lcp_restoring_fragments.remove(fragptr);
   c_lcp_complete_fragments.add(fragptr);
 
+  /**
+   * Disable expand check in ACC
+   *   before running REDO
+   */
+  tabptr.i = fragptr.p->tabRef;
+  ptrCheckGuard(tabptr, ctabrecFileSize, tablerec);
+  for (Uint32 i = 0; i<MAX_FRAG_PER_NODE; i++)
+  {
+    if (tabptr.p->fragrec[i] != RNIL)
+    {
+      signal->theData[0] = tabptr.i;
+      signal->theData[1] = tabptr.p->fragid[i];
+      sendSignal(DBACC_REF, GSN_EXPANDCHECK2, signal, 2, JBB);
+    }
+  }
+  
   if (!c_lcp_waiting_fragments.isEmpty())
   {
     send_restore_lcp(signal);

--- 1.24/storage/ndb/tools/select_all.cpp	2005-09-07 07:56:11 +02:00
+++ 1.25/storage/ndb/tools/select_all.cpp	2005-09-08 18:20:14 +02:00
@@ -43,6 +43,7 @@
 static int _unqualified, _header, _parallelism, _useHexFormat, _lock,
   _order, _descending;
 
+static int _tup = 0;
 static int _dumpDisk = 0;
 
 static struct my_option my_long_options[] =
@@ -75,6 +76,9 @@
   { "disk", 256, "Dump disk ref",
     (gptr*) &_dumpDisk, (gptr*) &_dumpDisk, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 }, 
+  { "tupscan", 't', "Scan in tup order",
+    (gptr*) &_tup, (gptr*) &_tup, 0,
+    GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 }, 
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 static void usage()
@@ -237,7 +241,8 @@
       break;
     case 0:
     default:
-      rs = pOp->readTuples(NdbScanOperation::LM_CommittedRead, 0, parallel);
+      rs = pOp->readTuples(NdbScanOperation::LM_CommittedRead, 
+			   _tup ? NdbScanOperation::SF_TupScan : 0, parallel);
       break;
     }
     if( rs != 0 ){