List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:October 25 2010 12:29pm
Subject:bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:3918)
View as plain text  
#At file:///home/msvensson/mysql/tmp/xd5G7MMkQx/7.1/ based on revid:magnus.blaudd@strippeds54zk3j

 3918 Magnus Blåudd	2010-10-25 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/CMakeLists.txt
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2010-10-25 09:38:22 +0000
+++ b/storage/ndb/CMakeLists.txt	2010-10-25 12:29:39 +0000
@@ -114,11 +114,11 @@ IF(WITHOUT_PARTITION_STORAGE_ENGINE)
 ENDIF(WITHOUT_PARTITION_STORAGE_ENGINE)
 
 SET(NDBCLUSTER_SOURCES
-  ${CMAKE_SOURCE_DIR}/sql/ha_ndbcluster.cc
-  ${CMAKE_SOURCE_DIR}/sql/ha_ndbcluster_cond.cc
-  ${CMAKE_SOURCE_DIR}/sql/ha_ndbcluster_connection.cc
-  ${CMAKE_SOURCE_DIR}/sql/ha_ndbcluster_binlog.cc
-  ${CMAKE_SOURCE_DIR}/sql/ha_ndbinfo.cc)
+  ../../sql/ha_ndbcluster.cc
+  ../../sql/ha_ndbcluster_cond.cc
+  ../../sql/ha_ndbcluster_connection.cc
+  ../../sql/ha_ndbcluster_binlog.cc
+  ../../sql/ha_ndbinfo.cc)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/include)
 
 

No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:3918) Magnus Blåudd25 Oct