diff options
| author | unknown <joreland@mysql.com> | 2004-11-22 15:28:13 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-11-22 15:28:13 +0100 |
| commit | cd15122d53f456d7909b1e6d25cff39e2e47299d (patch) | |
| tree | 7b5e10d00f7dd2fc6693eba090bbf5ffe2bc3e6a /ndb/src/ndbapi/NdbScanOperation.cpp | |
| parent | 3f5adbeeddaac2ba460e9c14881bcb19b70fb2d3 (diff) | |
| parent | 13816de9e424e67edb92e46a0ab2aca5bed42139 (diff) | |
| download | mariadb-git-cd15122d53f456d7909b1e6d25cff39e2e47299d.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
Auto merged
Diffstat (limited to 'ndb/src/ndbapi/NdbScanOperation.cpp')
| -rw-r--r-- | ndb/src/ndbapi/NdbScanOperation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/ndb/src/ndbapi/NdbScanOperation.cpp index 4f4ba59e59c..db0c294708d 100644 --- a/ndb/src/ndbapi/NdbScanOperation.cpp +++ b/ndb/src/ndbapi/NdbScanOperation.cpp @@ -702,7 +702,7 @@ NdbScanOperation::execCLOSE_SCAN_REP(){ m_api_receivers_count = 0; m_conf_receivers_count = 0; m_sent_receivers_count = 0; - m_current_api_receiver = theParallelism; + m_current_api_receiver = m_ordered ? theParallelism : 0; } void NdbScanOperation::release() |