Commit 1f63a25d authored by unknown's avatar unknown
Browse files

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
parents 2b4d7877 223c5d04

ndb/src/ndbapi/NdbScanOperation.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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()