diff options
author | unknown <joreland@mysql.com> | 2005-02-11 06:42:57 +0100 |
---|---|---|
committer | unknown <joreland@mysql.com> | 2005-02-11 06:42:57 +0100 |
commit | 0a0b9309eb1594f4e1bcc895cfed8ab367f0b734 (patch) | |
tree | fec33e0ea22d981565d9588092788f5134c65177 /ndb/test/run-test | |
parent | 527c2d74472c5f82331fb988aa39988040758ef5 (diff) | |
parent | d9de85b54412f30a1c5ae4a62128456122d413bc (diff) | |
download | mariadb-git-0a0b9309eb1594f4e1bcc895cfed8ab367f0b734.tar.gz |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
ndb/test/run-test/daily-devel-tests.txt:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
Diffstat (limited to 'ndb/test/run-test')
-rw-r--r-- | ndb/test/run-test/daily-devel-tests.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ndb/test/run-test/daily-devel-tests.txt b/ndb/test/run-test/daily-devel-tests.txt index 69c27ca229f..2cdd39ffa4c 100644 --- a/ndb/test/run-test/daily-devel-tests.txt +++ b/ndb/test/run-test/daily-devel-tests.txt @@ -210,26 +210,26 @@ args: max-time: 180 cmd: DbAsyncGenerator -args: -t 60 -p 1 +args: -time 60 -p 1 type: bench max-time: 180 cmd: DbAsyncGenerator -args: -t 60 -p 25 +args: -time 60 -p 25 type: bench max-time: 180 cmd: DbAsyncGenerator -args: -t 60 -p 100 +args: -time 60 -p 100 type: bench max-time: 180 cmd: DbAsyncGenerator -args: -t 60 -p 200 +args: -time 60 -p 200 type: bench max-time: 180 cmd: DbAsyncGenerator -args: -t 60 -p 1 -proc 25 +args: -time 60 -p 1 -proc 25 type: bench |