summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorunknown <pekka@clam.ndb.mysql.com>2006-06-21 17:17:12 +0200
committerunknown <pekka@clam.ndb.mysql.com>2006-06-21 17:17:12 +0200
commit1cd8b43f9e8bfafc90af79a72716eaa85a6a1648 (patch)
tree4aceb87fa0d785b0730f0fd0cfdea11d6d68abd3 /storage
parent5f0eba6f87ddf8e961d8a125416bacb19e024d7e (diff)
downloadmariadb-git-1cd8b43f9e8bfafc90af79a72716eaa85a6a1648.tar.gz
ndb - add test_event_merge to daily-devel-tests.txt
storage/ndb/test/run-test/daily-devel-tests.txt: test_event_merge
Diffstat (limited to 'storage')
-rw-r--r--storage/ndb/test/run-test/daily-devel-tests.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/storage/ndb/test/run-test/daily-devel-tests.txt b/storage/ndb/test/run-test/daily-devel-tests.txt
index 75b85ebb1d2..8c1fa491cb9 100644
--- a/storage/ndb/test/run-test/daily-devel-tests.txt
+++ b/storage/ndb/test/run-test/daily-devel-tests.txt
@@ -228,6 +228,16 @@ max-time: 2500
cmd: test_event
args: -n CreateDropNR -l 2
+#
+max-time: 600
+cmd: test_event_merge
+args: --no-implicit-nulls --separate-events --maxops 10000
+
+#
+max-time: 600
+cmd: test_event_merge
+args: --no-implicit-nulls --no-multiops
+
max-time: 600
cmd: testBasic
args: -n PkRead T1