diff options
| author | unknown <joreland@mysql.com> | 2004-11-24 10:52:21 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-11-24 10:52:21 +0100 |
| commit | e0ec1f1609e4e877a75b0b72066d627ebdd090c9 (patch) | |
| tree | 233f7faa6d4df7e71260b22969c1699ad7a58f50 | |
| parent | 0b6f218e710ce1a3822a2c5e960bc8ce0de6704d (diff) | |
| parent | e26a5dbc6a4a9cd24f12d20bf08c3988ee5d0527 (diff) | |
| download | mariadb-git-e0ec1f1609e4e877a75b0b72066d627ebdd090c9.tar.gz | |
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
| -rw-r--r-- | ndb/src/kernel/blocks/dblqh/DblqhMain.cpp | 1 | ||||
| -rw-r--r-- | ndb/test/run-test/daily-basic-tests.txt | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp index fc0f39a4f5f..432bb1511aa 100644 --- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp +++ b/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 diff --git a/ndb/test/run-test/daily-basic-tests.txt b/ndb/test/run-test/daily-basic-tests.txt index 8d7e8a06c72..aa38fb4763c 100644 --- a/ndb/test/run-test/daily-basic-tests.txt +++ b/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 |