List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:November 29 2010 4:27pm
Subject:bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4029 to 4030)
View as plain text  
 4030 Magnus Blåudd	2010-11-29
      ndb
       - Add LIBSOCKET into ndbportlib so that all users of portlib get the
         proper socket libraries linked in.

    modified:
      storage/ndb/src/common/portlib/CMakeLists.txt
 4029 Jonas Oreland	2010-11-29 [merge]
      ndb - merge 63 to 70

    modified:
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test
      sql/ha_ndbcluster.cc
=== modified file 'storage/ndb/src/common/portlib/CMakeLists.txt'
--- a/storage/ndb/src/common/portlib/CMakeLists.txt	2010-11-03 21:21:28 +0000
+++ b/storage/ndb/src/common/portlib/CMakeLists.txt	2010-11-29 16:19:21 +0000
@@ -28,7 +28,7 @@ ADD_LIBRARY(ndbportlib STATIC
             NdbMem.c NdbConfig.c NdbTick.c NdbDir.cpp
             ndb_daemon.cc ${EXTRA_SRC}
             NdbNuma.cpp)
-TARGET_LINK_LIBRARIES(ndbportlib mysys)
+TARGET_LINK_LIBRARIES(ndbportlib mysys ${LIBSOCKET})
 
 ADD_EXECUTABLE(NdbDir-t
   NdbDir.cpp

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4029 to 4030) Magnus Blåudd29 Nov