diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2008-01-11 09:31:55 +0100 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2008-01-11 09:31:55 +0100 |
| commit | b64f9dbe155e713c1f801b6ee4d114b09ce2b610 (patch) | |
| tree | 4bf179442d9fb6dc675e2d062f175d17fc4cbaa0 /storage/ndb/test/run-test/daily-basic-tests.txt | |
| parent | d4045eedd818fd4b9ae93885091091e384fc5932 (diff) | |
| parent | e984956385c6ee6370da97655bc217070558fbb1 (diff) | |
| download | mariadb-git-b64f9dbe155e713c1f801b6ee4d114b09ce2b610.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
Diffstat (limited to 'storage/ndb/test/run-test/daily-basic-tests.txt')
| -rw-r--r-- | storage/ndb/test/run-test/daily-basic-tests.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/ndb/test/run-test/daily-basic-tests.txt b/storage/ndb/test/run-test/daily-basic-tests.txt index 37db5e01dd6..1aee1555f00 100644 --- a/storage/ndb/test/run-test/daily-basic-tests.txt +++ b/storage/ndb/test/run-test/daily-basic-tests.txt @@ -1046,3 +1046,7 @@ max-time: 300 cmd: testSystemRestart args: -n Bug22696 T1 +max-time: 300 +cmd: test_event +args: -n Bug33793 T1 + |