bk commit into 5.1 tree (pekka:1.2234)

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2234 06/06/21 17:17:12 pekka@stripped +1 -0
  ndb - add test_event_merge to daily-devel-tests.txt

  storage/ndb/test/run-test/daily-devel-tests.txt
    1.29 06/06/21 17:16:15 pekka@stripped +10 -0
    test_event_merge

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space/pekka/ndb/version/my51-bug18102

--- 1.28/storage/ndb/test/run-test/daily-devel-tests.txt	2006-06-12 17:55:39 +02:00
+++ 1.29/storage/ndb/test/run-test/daily-devel-tests.txt	2006-06-21 17:16:15 +02:00
@@ -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