List:Commits« Previous MessageNext Message »
From:jonas oreland Date:January 23 2012 5:43pm
Subject:bzr push into mysql-5.5-cluster-7.2 branch (jonas.oreland:3780 to 3781)
View as plain text  
 3781 jonas oreland	2012-01-23 [merge]
      ndb - merge 71 to 72

    renamed:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_basic.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_basic.test
    modified:
      storage/ndb/src/kernel/vm/CMakeLists.txt
 3780 Jonas Oreland	2012-01-23 [merge]
      ndb - merge 71 to 72

    modified:
      storage/ndb/src/kernel/vm/CountingPool.cpp
=== renamed file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_basic.result'
=== renamed file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_basic.test'
=== modified file 'storage/ndb/src/kernel/vm/CMakeLists.txt'
--- a/storage/ndb/src/kernel/vm/CMakeLists.txt	2012-01-23 08:29:37 +0000
+++ b/storage/ndb/src/kernel/vm/CMakeLists.txt	2012-01-23 17:41:27 +0000
@@ -72,7 +72,7 @@ SET_TARGET_PROPERTIES(mt_thr_config-t
                       PROPERTIES COMPILE_FLAGS "-DTEST_MT_THR_CONFIG")
 TARGET_LINK_LIBRARIES(mt_thr_config-t ndbgeneral)
 
-FOREACH(testprog IN ITEMS CountingPool DynArr256)
+FOREACH(testprog CountingPool DynArr256)
   ADD_EXECUTABLE(${testprog}-t ${testprog}.cpp)
   SET_TARGET_PROPERTIES(${testprog}-t PROPERTIES COMPILE_FLAGS "-DTAP_TEST")
   TARGET_LINK_LIBRARIES(${testprog}-t ndbtest ndbkernel ndbsched ndberror

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster-7.2 branch (jonas.oreland:3780 to 3781) jonas oreland23 Jan