diff options
| author | unknown <knielsen@ymer.(none)> | 2007-04-25 15:02:23 +0200 |
|---|---|---|
| committer | unknown <knielsen@ymer.(none)> | 2007-04-25 15:02:23 +0200 |
| commit | dd92e293200b4cacc3825de55ea9405abd1215a9 (patch) | |
| tree | a5242c0c0131472292ba834d76589fa6c261eb0d /storage/ndb | |
| parent | c37fa8fed212808c3bea8dadd084f6c89d3ceaf2 (diff) | |
| download | mariadb-git-dd92e293200b4cacc3825de55ea9405abd1215a9.tar.gz | |
After-merge fixes.
Diffstat (limited to 'storage/ndb')
| -rw-r--r-- | storage/ndb/include/kernel/signaldata/ScanTab.hpp | 2 | ||||
| -rw-r--r-- | storage/ndb/src/ndbapi/NdbScanOperation.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/ndb/include/kernel/signaldata/ScanTab.hpp b/storage/ndb/include/kernel/signaldata/ScanTab.hpp index a9d41b5a975..0074078533f 100644 --- a/storage/ndb/include/kernel/signaldata/ScanTab.hpp +++ b/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 diff --git a/storage/ndb/src/ndbapi/NdbScanOperation.cpp b/storage/ndb/src/ndbapi/NdbScanOperation.cpp index 73d28acf6c3..30264dd6ccb 100644 --- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp +++ b/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 |