After-merge fixes.

storage/ndb/include/kernel/signaldata/ScanTab.hpp

@@ -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

storage/ndb/src/ndbapi/NdbScanOperation.cpp

@@ -140,7 +140,7 @@ NdbScanOperation::readTuples(NdbScanOperation::LockMode lm,
   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