bk commit into 5.1 tree (knielsen:1.2530)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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-04-25 15:02:23+02:00, knielsen@ymer.(none) +2 -0
  After-merge fixes.

  storage/ndb/include/kernel/signaldata/ScanTab.hpp@stripped, 2007-04-25 15:02:21+02:00,
knielsen@ymer.(none) +1 -1
    After-merge fixes.

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@stripped, 2007-04-25 15:02:21+02:00,
knielsen@ymer.(none) +1 -1
    After-merge fixes.

# 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:	knielsen
# Host:	ymer.(none)
# Root:	/usr/local/mysql/mysql-5.1-new-ndb

--- 1.18/storage/ndb/include/kernel/signaldata/ScanTab.hpp	2007-04-25 15:02:31 +02:00
+++ 1.19/storage/ndb/include/kernel/signaldata/ScanTab.hpp	2007-04-25 15:02:31 +02:00
@@ -116,7 +116,7 @@ private:
  x = Range Scan (TUX)      - 1  Bit 15
  b = Scan batch            - 10 Bit 16-25 (max 1023)
  d = Distribution key flag - 1  Bit 26
- n = No disk flag
+ n = No disk flag          - 1  Bit 9
 
            1111111111222222222233
  01234567890123456789012345678901

--- 1.113/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2007-04-25 15:02:31 +02:00
+++ 1.114/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2007-04-25 15:02:31 +02:00
@@ -140,7 +140,7 @@ NdbScanOperation::readTuples(NdbScanOper
   theNdbCon->theScanningOp = this;
   bool tupScan = (scan_flags & SF_TupScan);
 
-#if 1 // XXX temp for testing
+#if 0 // XXX temp for testing
   { char* p = getenv("NDB_USE_TUPSCAN");
     if (p != 0) {
       unsigned n = atoi(p); // 0-10