MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:October 8 2009 1:47pm
Subject:bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:3061 to 3062)
View as plain text  
 3062 Magnus Blåudd	2009-10-08 [merge]
      Merge

    modified:
      storage/ndb/src/kernel/blocks/dbdih/CMakeLists.txt
      storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt
 3061 Frazer Clement	2009-10-08 [merge]
      Merge 7.0->7.1

    added:
      mysql-test/include/not_windows_embedded.inc
    modified:
      mysql-test/mysql-test-run.pl
      mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test
      mysql-test/t/plugin.test
      mysql-test/t/plugin_load.test
      storage/ndb/include/util/SocketServer.hpp
      storage/ndb/src/common/util/SocketServer.cpp
      storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
      storage/ndb/src/mgmsrv/Services.cpp
      storage/ndb/test/ndbapi/testMgm.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dbdih/CMakeLists.txt	2008-08-21 01:44:46 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/CMakeLists.txt	2009-10-08 13:26:22 +0000
@@ -16,16 +16,10 @@
 
 INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_kernel.cmake)
 
-LINK_LIBRARIES(ndbgeneral
-               ndbportlib)
-IF(WIN32)
-LINK_LIBRARIES(wsock32)
-ENDIF(WIN32)
-
 ADD_LIBRARY(ndbdbdih STATIC
-            DbdihInit.cpp
-            DbdihMain.cpp)
+    DbdihInit.cpp
+    DbdihMain.cpp)
 
 ADD_EXECUTABLE(ndbd_sysfile_reader
-               printSysfile.cpp)
+    printSysfile.cpp)
 TARGET_LINK_LIBRARIES(ndbd_sysfile_reader dbug mysys strings)

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt	2008-08-29 02:14:51 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt	2009-10-08 13:26:22 +0000
@@ -16,15 +16,13 @@
 
 INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_kernel.cmake)
 
-LINK_LIBRARIES(ndbgeneral
-               ndbportlib)
-IF(WIN32)
-LINK_LIBRARIES(wsock32)
-ENDIF(WIN32)
-
 ADD_LIBRARY(ndbdblqh STATIC
-            DblqhInit.cpp DblqhMain.cpp DblqhProxy.cpp DblqhCommon.cpp)
+    DblqhInit.cpp
+    DblqhMain.cpp
+    DblqhProxy.cpp
+    DblqhCommon.cpp)
 
 ADD_EXECUTABLE(ndbd_redo_log_reader
-               redoLogReader/records.cpp
-               redoLogReader/reader.cpp)
+    redoLogReader/records.cpp
+    redoLogReader/reader.cpp)
+TARGET_LINK_LIBRARIES(ndbd_redo_log_reader ndbtrace ndblogger ndbgeneral ndberror ndbportlib)

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@sun.com-20091008134559-qvh92plgvesroiow.bundle
Thread
bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:3061 to 3062)Magnus Blåudd8 Oct