Skip to content

M
mariadb
Commit 45e18df8 authored by knielsen@ymer.(none)'s avatar knielsen@ymer.(none)
Browse files
Options

After-merge fixes.

parent ae8f9ac9
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
storage/ndb/include/kernel/signaldata/ScanTab.hpp
View file @ 45e18df8
...@@ -116,7 +116,7 @@ private: ...@@ -116,7 +116,7 @@ private:
x = Range Scan (TUX) - 1 Bit 15 x = Range Scan (TUX) - 1 Bit 15
b = Scan batch - 10 Bit 16-25 (max 1023) b = Scan batch - 10 Bit 16-25 (max 1023)
d = Distribution key flag - 1 Bit 26 d = Distribution key flag - 1 Bit 26
n = No disk flag n = No disk flag - 1 Bit 9
1111111111222222222233 1111111111222222222233
01234567890123456789012345678901 01234567890123456789012345678901
......
storage/ndb/src/ndbapi/NdbScanOperation.cpp
View file @ 45e18df8
...@@ -140,7 +140,7 @@ NdbScanOperation::readTuples(NdbScanOperation::LockMode lm, ...@@ -140,7 +140,7 @@ NdbScanOperation::readTuples(NdbScanOperation::LockMode lm,
theNdbCon->theScanningOp = this; theNdbCon->theScanningOp = this;
bool tupScan = (scan_flags & SF_TupScan); bool tupScan = (scan_flags & SF_TupScan);
#if 1 // XXX temp for testing #if 0 // XXX temp for testing
{ char* p = getenv("NDB_USE_TUPSCAN"); { char* p = getenv("NDB_USE_TUPSCAN");
if (p != 0) { if (p != 0) {
unsigned n = atoi(p); // 0-10 unsigned n = atoi(p); // 0-10
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7