ndb - dbacc -

  fix gcc4 compile error


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  add block to remove gcc compiler error
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  add jamEntry

2 files changed, 27 insertions, 19 deletions

diff --git a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
index ffb3d673713..dc8b123f10f 100644
--- a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
@@ -1262,27 +1262,29 @@ Dbacc::startNext(Signal* signal, OperationrecPtr lastOp)
   ptrCheckGuard(nextOp, coprecsize, operationrec);  
   nextbits = nextOp.p->m_op_bits;
   
-  bool same = nextOp.p->is_same_trans(lastOp.p);
-
-  if (!same && ((opbits & Operationrec::OP_ACC_LOCK_MODE) ||
-		(nextbits & Operationrec::OP_LOCK_MODE)))
   {
-    jam();
+    const bool same = nextOp.p->is_same_trans(lastOp.p);
+    
+    if (!same && ((opbits & Operationrec::OP_ACC_LOCK_MODE) ||
+		  (nextbits & Operationrec::OP_LOCK_MODE)))
+    {
+      jam();
+      /**
+       * Not same transaction
+       *  and either last had exclusive lock
+       *          or next had exclusive lock
+       */
+      return;
+    }
+    
     /**
-     * Not same transaction
-     *  and either last had exclusive lock
-     *          or next had exclusive lock
+     * same trans and X-lock
      */
-    return;
-  }
-
-  /**
-   * same trans and X-lock
-   */
-  if (same && (opbits & Operationrec::OP_ACC_LOCK_MODE))
-  {
-    jam();
-    goto upgrade;
+    if (same && (opbits & Operationrec::OP_ACC_LOCK_MODE))
+    {
+      jam();
+      goto upgrade;
+    }
   }
 
   /**
@@ -1294,7 +1296,7 @@ Dbacc::startNext(Signal* signal, OperationrecPtr lastOp)
     jam();
     goto upgrade;
   }
-
+  
   /**
    * There is a shared parallell queue & and exclusive op is first in queue
    */
diff --git a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index 6b0b59ca8f9..b4ea9a18de5 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -9063,6 +9063,7 @@ Dblqh::readPrimaryKeys(ScanRecord *scanP, TcConnectionrec *tcConP, Uint32 *dst)
   }
 
   int ret = c_tup->accReadPk(tableId, fragId, fragPageId, pageIndex, dst, false);
+  jamEntry();
   if(0)
     ndbout_c("readPrimaryKeys(table: %d fragment: %d [ %d %d ] -> %d",
 	     tableId, fragId, fragPageId, pageIndex, ret);
@@ -9434,6 +9435,11 @@ Uint32 Dblqh::initScanrec(const ScanFragReq* scanFragReq)
   scanptr.p->m_max_batch_size_rows = max_rows;
   scanptr.p->m_max_batch_size_bytes = max_bytes;
 
+#if 0
+  if (! rangeScan)
+    tupScan = 1;
+#endif
+
   if (! rangeScan && ! tupScan)
     scanptr.p->scanBlockref = tcConnectptr.p->tcAccBlockref;
   else if (! tupScan)