Merge mysql.com:/home/jonas/src/mysql-4.1-fix

into mysql.com:/home/jonas/src/wl2077

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/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