bk commit into 5.0 tree (pekka:1.1802)

[pekka]

Below is the list of changes that have just been committed into a local
5.0 repository of pekka. When pekka 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.1802 05/04/22 12:35:31 pekka@stripped +2 -0
  ndb - wl#2455 cont'd

  ndb/test/ndbapi/testOIBasic.cpp
    1.38 05/04/22 12:23:50 pekka@stripped +11 -3
    tup scan: testOIBasic + fix

  ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
    1.2 05/04/22 12:23:49 pekka@stripped +1 -0
    tup scan: testOIBasic + fix

# 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:	pekka
# Host:	tuna.ndb.mysql.com
# Root:	/orca/space/pekka/ndb/version/my50-ndb

--- 1.37/ndb/test/ndbapi/testOIBasic.cpp	2005-04-13 07:42:59 +02:00
+++ 1.38/ndb/test/ndbapi/testOIBasic.cpp	2005-04-22 12:23:50 +02:00
@@ -257,7 +257,8 @@
   // deadlock possible
   bool m_deadlock;
   NdbOperation::LockMode m_lockmode;
-  // ordered range scan
+  // scan options
+  bool m_tupscan;
   bool m_ordered;
   bool m_descending;
   // timer location
@@ -279,6 +280,7 @@
     m_verify(false),
     m_deadlock(false),
     m_lockmode(NdbOperation::LM_Read),
+    m_tupscan(false),
     m_ordered(false),
     m_descending(false) {
   }
@@ -1370,7 +1372,10 @@
 Con::readTuples(Par par)
 {
   assert(m_tx != 0 && m_scanop != 0);
-  CHKCON(m_scanop->readTuples(par.m_lockmode, 0, par.m_scanpar) == 0, *this);
+  int scan_flags = 0;
+  if (par.m_tupscan)
+    scan_flags |= NdbScanOperation::SF_TupScan;
+  CHKCON(m_scanop->readTuples(par.m_lockmode, scan_flags, par.m_scanpar) == 0, *this);
   return 0;
 }
 
@@ -3554,7 +3559,7 @@
   const Set& set = par.set();
   // expected
   const Set& set1 = set;
-  LL3("scanread " << tab.m_name << " lockmode=" << par.m_lockmode
<< " expect=" << set1.count() << " verify=" << par.m_verify);
+  LL3("scanread " << tab.m_name << " lockmode=" << par.m_lockmode
<< " tupscan=" << par.m_tupscan << " expect=" << set1.count()
<< " verify=" << par.m_verify);
   Set set2(tab, set.m_rows);
   CHK(con.startTransaction() == 0);
   CHK(con.getNdbScanOperation(tab) == 0);
@@ -4107,6 +4112,9 @@
   const Tab& tab = par.tab();
   if (par.m_no == 0) {
     // thread 0 scans table
+    CHK(scanreadtable(par) == 0);
+    // once more via tup scan
+    par.m_tupscan = true;
     CHK(scanreadtable(par) == 0);
   }
   // each thread scans different indexes

--- 1.1/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2005-04-07 11:27:56 +02:00
+++ 1.2/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2005-04-22 12:23:49 +02:00
@@ -161,6 +161,7 @@
     jam();
     const PagePos& pos = scan.m_scanPos;
     NextScanConf* const conf = (NextScanConf*)signal->getDataPtrSend();
+    conf->scanPtr = scan.m_userPtr;
     conf->accOperationPtr = (Uint32)-1; // no lock returned
     conf->fragId = frag.fragmentId | pos.m_fragBit;
     conf->localKey[0] = (pos.m_pageId << MAX_TUPLES_BITS) |