List:Commits« Previous MessageNext Message »
From:pekka Date:December 27 2005 5:48pm
Subject:bk commit into 5.1 tree (pekka:1.1999)
View as plain text  
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.1999 05/12/27 18:47:56 pekka@stripped +2 -0
  ndb - post merge fix

  storage/ndb/test/ndbapi/Makefile.am
    1.27 05/12/27 18:45:00 pekka@stripped +4 -1
    post-merge fix

  storage/ndb/test/ndbapi/test_event_merge.cpp
    1.3 05/12/27 18:44:04 pekka@stripped +0 -0
    Rename: ndb/test/ndbapi/test_event_merge.cpp -> storage/ndb/test/ndbapi/test_event_merge.cpp

# 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

--- 1.26/storage/ndb/test/ndbapi/Makefile.am	2005-12-27 18:28:35 +01:00
+++ 1.27/storage/ndb/test/ndbapi/Makefile.am	2005-12-27 18:45:00 +01:00
@@ -34,7 +34,8 @@
 testPartitioning \
 testBitfield \
 DbCreate DbAsyncGenerator \
-testSRBank
+testSRBank \
+test_event_merge
 
 #flexTimedAsynch
 #testBlobs
@@ -78,6 +79,7 @@
 DbCreate_SOURCES = bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterface.cpp bench/dbPopulate.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
 DbAsyncGenerator_SOURCES = bench/mainAsyncGenerator.cpp bench/asyncGenerator.cpp bench/ndb_async2.cpp bench/dbGenerator.h bench/macros.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
 testSRBank_SOURCES = testSRBank.cpp
+test_event_merge_SOURCES = test_event_merge.cpp
 
 INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/kernel
 
@@ -158,3 +160,4 @@
 	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
 	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testScan_SOURCES)
 	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
+
Thread
bk commit into 5.1 tree (pekka:1.1999)pekka27 Dec