Merge bk-internal:/home/bk/mysql-5.0

into mysql.com:/data0/knielsen/tmp-5.0

Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/data0/knielsen/tmp-5.0
ff0041e8 · knielsen@mysql.com · 7892dca1 · d0146162 · ff0041e8
Commit ff0041e8 authored Jul 04, 2006 by knielsen@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

ndb/src/ndbapi/NdbScanOperation.cpp ndb/src/ndbapi/NdbScanOperation.cpp +4 -1

No files found.
--- 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))
    {