From 7f9bfc20582df47a65c5c21c48d82f1e7c3c31d3 Mon Sep 17 00:00:00 2001
From: "pekka@clam.ndb.mysql.com" <>
Date: Wed, 21 Jun 2006 17:17:12 +0200
Subject: [PATCH] ndb - add test_event_merge to daily-devel-tests.txt

---
 storage/ndb/test/run-test/daily-devel-tests.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

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