Commit e0ec1f16 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/DblqhMain.cpp:
  Auto merged
parents 0b6f218e e26a5dbc

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

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

+4 −0
Original line number Diff line number Diff line
@@ -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