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/DblqhMain.cpp

@@ -3084,6 +3084,7 @@ void Dblqh::execATTRINFO(Signal* signal)
       return;
       break;
     default:
+      ndbout_c("%d", regTcPtr->transactionState);
       ndbrequire(false);
       break;
     }//switch

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()

ndb/test/run-test/daily-basic-tests.txt

@@ -222,6 +222,10 @@ max-time: 500
 cmd: testScan
 args: -n ScanRead488 -l 10 T6 
 
+max-time: 500
+cmd: testScan
+args: -n ScanRead488Timeout -l 10 T6 
+
 max-time: 600
 cmd: testScan
 args: -n ScanRead40 -l 100 T2