List:Commits« Previous MessageNext Message »
From:jonas oreland Date:August 27 2011 1:09pm
Subject:bzr push into mysql-5.5-cluster branch (jonas.oreland:3442 to 3443)
View as plain text  
 3443 jonas oreland	2011-08-27
      ndb - merge error in .bzr-mysql/default.conf

    modified:
      .bzr-mysql/default.conf
 3442 jonas oreland	2011-08-27 [merge]
      ndb - merge 71 into cluster-5.5

    added:
      storage/ndb/src/kernel/vm/mt_thr_config.cpp
      storage/ndb/src/kernel/vm/mt_thr_config.hpp
    modified:
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbinfo.cc
      storage/ndb/include/util/SparseBitmask.hpp
      storage/ndb/src/kernel/SimBlockList.cpp
      storage/ndb/src/kernel/vm/CMakeLists.txt
      storage/ndb/src/kernel/vm/Configuration.cpp
      storage/ndb/src/kernel/vm/Configuration.hpp
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp
      storage/ndb/src/kernel/vm/dummy_nonmt.cpp
      storage/ndb/src/kernel/vm/mt.cpp
      storage/ndb/src/kernel/vm/mt.hpp
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2011-08-26 14:00:43 +0000
+++ b/.bzr-mysql/default.conf	2011-08-27 13:09:12 +0000
@@ -2,4 +2,3 @@
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
 tree_name = "mysql-5.5-cluster"
-tree_name = "mysql-5.5"

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster branch (jonas.oreland:3442 to 3443) jonas oreland29 Aug