From: Pekka Nousiainen Date: May 30 2011 8:02am Subject: bzr push into mysql-5.1-telco-7.0-wl4124-new0 branch (pekka.nousiainen:4384 to 4385) List-Archive: http://lists.mysql.com/commits/138363 Message-Id: <20110530080213.960C95586A@sama.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4385 Pekka Nousiainen 2011-05-30 treename modified: .bzr-mysql/default.conf 4384 Pekka Nousiainen 2011-05-29 [merge] merge from main into wl4124 modified: storage/ndb/include/kernel/ndb_limits.h storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp storage/ndb/include/kernel/signaldata/SumaImpl.hpp storage/ndb/include/kernel/signaldata/TupCommit.hpp storage/ndb/include/ndbapi/NdbEventOperation.hpp storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp storage/ndb/src/kernel/blocks/LocalProxy.cpp storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.cpp storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.hpp storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp storage/ndb/src/kernel/blocks/suma/Suma.cpp storage/ndb/src/ndbapi/NdbEventOperation.cpp storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp storage/ndb/src/ndbapi/NdbQueryOperation.cpp storage/ndb/test/include/HugoOperations.hpp storage/ndb/test/ndbapi/test_event.cpp storage/ndb/test/run-test/daily-basic-tests.txt storage/ndb/test/run-test/daily-devel-tests.txt storage/ndb/test/src/HugoOperations.cpp === modified file '.bzr-mysql/default.conf' --- a/.bzr-mysql/default.conf 2011-05-25 15:03:11 +0000 +++ b/.bzr-mysql/default.conf 2011-05-30 08:00:00 +0000 @@ -1,4 +1,4 @@ [MYSQL] post_commit_to = commits@stripped post_push_to = commits@stripped -tree_name = mysql-5.1-telco-7.0-wl4124 +tree_name = mysql-5.1-telco-7.0-wl4124-new0 No bundle (reason: useless for push emails).