diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2005-12-13 11:54:42 +0100 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2005-12-13 11:54:42 +0100 |
| commit | 01c7bd20b9fc28530387eeb5e3165f9ad8535301 (patch) | |
| tree | 7e3d3ff692b611a80ae1078b5a69f09f9f5ded6d /ndb/test/run-test | |
| parent | 374dd037683065d8c7701ead56cb2eb9260812b1 (diff) | |
| parent | fd80fa2d4c5c45c64f16283c61e6926eea3f3af1 (diff) | |
| download | mariadb-git-01c7bd20b9fc28530387eeb5e3165f9ad8535301.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
merge
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
merge
ndb/test/run-test/daily-basic-tests.txt:
merge
Diffstat (limited to 'ndb/test/run-test')
| -rw-r--r-- | ndb/test/run-test/daily-basic-tests.txt | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/ndb/test/run-test/daily-basic-tests.txt b/ndb/test/run-test/daily-basic-tests.txt index 8b44594a9b5..59f51044b51 100644 --- a/ndb/test/run-test/daily-basic-tests.txt +++ b/ndb/test/run-test/daily-basic-tests.txt @@ -413,6 +413,27 @@ max-time: 500 cmd: testScan args: -n ScanParallelism +max-time: 500 +cmd: testNodeRestart +args: -n Bug15587 T1 + +max-time: 500 +cmd: testNodeRestart +args: -n Bug15632 T1 + +max-time: 500 +cmd: testNodeRestart +args: -n Bug15685 T1 + +# OLD FLEX +max-time: 500 +cmd: flexBench +args: -c 25 -t 10 + +max-time: 500 +cmd: flexHammer +args: -r 5 -t 32 + # # DICT TESTS max-time: 1500 |