diff options
| author | unknown <joreland@mysql.com> | 2004-11-24 10:49:24 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-11-24 10:49:24 +0100 |
| commit | ece00b330e291421ac715c91fdab3f46f63c6a67 (patch) | |
| tree | be67591cdbc27605172094c3217452485525951a /ndb/src/ndbapi/NdbScanOperation.cpp | |
| parent | 3d97aeeee15ff256149d0fce7cdd947bbbbc3dd5 (diff) | |
| parent | 4048a76d6565723993520fbdc8c42b0001d6ed5f (diff) | |
| download | mariadb-git-ece00b330e291421ac715c91fdab3f46f63c6a67.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0-ndb
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 bedbbb5cef4..d6074ca04fc 100644 --- a/ndb/src/ndbapi/NdbScanOperation.cpp +++ b/ndb/src/ndbapi/NdbScanOperation.cpp @@ -635,7 +635,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() |