diff options
| author | unknown <jonas@mc01.ndb.mysql.com> | 2006-07-04 16:54:07 +0200 |
|---|---|---|
| committer | unknown <jonas@mc01.ndb.mysql.com> | 2006-07-04 16:54:07 +0200 |
| commit | 95e37a4ad5d0eed8d41be7879d8fbb7e422d8b79 (patch) | |
| tree | 95c4d9fba12dc3c735e25586ff1c1e9f8ea144fe /ndb | |
| parent | 05348e417d1606eb7ebafcd4f7f69ee82f65f6b8 (diff) | |
| download | mariadb-git-95e37a4ad5d0eed8d41be7879d8fbb7e422d8b79.tar.gz | |
ndb - ps_7ndb as discovered by pb
fix race in scan close
ndb/src/ndbapi/NdbScanOperation.cpp:
Fix race in scan close
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/ndbapi/NdbScanOperation.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/ndb/src/ndbapi/NdbScanOperation.cpp index a36d47c3471..caf6cf755bb 100644 --- a/ndb/src/ndbapi/NdbScanOperation.cpp +++ b/ndb/src/ndbapi/NdbScanOperation.cpp @@ -1550,7 +1550,10 @@ NdbScanOperation::close_impl(TransporterFacade* tp, bool forceSend){ * If no receiver is outstanding... * set it to 1 as execCLOSE_SCAN_REP resets it */ - m_sent_receivers_count = m_sent_receivers_count ? m_sent_receivers_count : 1; + if (m_sent_receivers_count < theParallelism) + m_sent_receivers_count++; + else + m_conf_receivers_count++; while(theError.code == 0 && (m_sent_receivers_count + m_conf_receivers_count)) { |