List:Commits« Previous MessageNext Message »
From:magnus.blaudd Date:May 24 2011 12:16pm
Subject:bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:4220)
View as plain text  
#At file:///home/msvensson/mysql/tmp/Mfwk0Gjx5d/7.1/ based on revid:magnus.blaudd@stripped

 4220 magnus.blaudd@stripped	2011-05-24 [merge]
      Merge 7.0 -> 7.1

    modified:
      CMakeLists.txt
      storage/ndb/src/mgmsrv/Config.hpp
      storage/ndb/tools/CMakeLists.txt
      storage/ndb/tools/Makefile.am
      storage/ndb/tools/ndb_config.cpp
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2011-05-24 08:33:20 +0000
+++ b/CMakeLists.txt	2011-05-24 11:41:58 +0000
@@ -128,6 +128,14 @@ IF(MSVC)
     # generate map files, set stack size (see bug#20815)
     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")
     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1048576")
+    IF(NOT MCP_BUG11765145)
+      # Fails to link with error message about missing .map file, turn
+      # off incremental linking to workaround problem 
+      IF(CMAKE_GENERATOR MATCHES "Visual Studio 10")
+        MESSAGE(STATUS "Turning off incremental linking for VS 2010")
+        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL:NO")
+      ENDIF()
+    ENDIF()
 
     # remove support for Exception handling
     STRING(REPLACE "/GX"   "" CMAKE_CXX_FLAGS            ${CMAKE_CXX_FLAGS})

=== modified file 'storage/ndb/src/mgmsrv/Config.hpp'
--- a/storage/ndb/src/mgmsrv/Config.hpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/src/mgmsrv/Config.hpp	2011-05-24 11:51:39 +0000
@@ -22,7 +22,7 @@
 #include <kernel/NodeBitmask.hpp>
 #include "ConfigInfo.hpp"
 #include <mgmapi.h>
-#include <mgmapi_configuration.hpp>
+#include "../mgmapi/mgmapi_configuration.hpp"
 
 
 /**

=== modified file 'storage/ndb/tools/CMakeLists.txt'
--- a/storage/ndb/tools/CMakeLists.txt	2011-02-03 14:45:49 +0000
+++ b/storage/ndb/tools/CMakeLists.txt	2011-05-24 12:16:31 +0000
@@ -72,12 +72,6 @@ MYSQL_ADD_EXECUTABLE(ndb_config
   COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_config ndbmgmclient ndbconf)
 
-SET(options "-I${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmapi")
-SET(options "${options} -I${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmsrv")
-SET(options "${options} -I${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmcommon")
-SET_TARGET_PROPERTIES(ndb_config PROPERTIES
-                      COMPILE_FLAGS "${options}")
-
 # Build ndbinfo_sql and run it to create ndbinfo.sql
 ADD_EXECUTABLE(ndbinfo_sql ndbinfo_sql.cpp)
 TARGET_LINK_LIBRARIES(ndbinfo_sql ndbclient)

=== modified file 'storage/ndb/tools/Makefile.am'
--- a/storage/ndb/tools/Makefile.am	2011-02-23 22:48:42 +0000
+++ b/storage/ndb/tools/Makefile.am	2011-05-24 11:51:39 +0000
@@ -60,10 +60,6 @@ ndb_config_SOURCES = ndb_config.cpp \
 	../src/mgmsrv/ConfigInfo.cpp \
 	../src/mgmsrv/InitConfigFileParser.cpp
 
-ndb_config_CXXFLAGS = -I$(top_srcdir)/storage/ndb/src/mgmapi \
-                      -I$(top_srcdir)/storage/ndb/src/mgmsrv \
-                      -I$(top_srcdir)/storage/ndb/include/mgmcommon
-
 ndb_restore_LDADD = $(top_builddir)/storage/ndb/src/common/util/libndbazio.la \
                     $(LDADD)
 

=== modified file 'storage/ndb/tools/ndb_config.cpp'
--- a/storage/ndb/tools/ndb_config.cpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/tools/ndb_config.cpp	2011-05-24 11:51:39 +0000
@@ -28,8 +28,8 @@
 
 #include <NdbOut.hpp>
 #include <mgmapi.h>
-#include <mgmapi_configuration.hpp>
-#include <ConfigInfo.hpp>
+#include "../src/mgmapi/mgmapi_configuration.hpp"
+#include "../src/mgmsrv/ConfigInfo.hpp"
 #include <NdbAutoPtr.hpp>
 #include <NdbTCP.h>
 
@@ -552,7 +552,7 @@ noconnect:
   return conf;
 }
 
-#include <Config.hpp>
+#include "../src/mgmsrv/Config.hpp"
 #include <EventLogger.hpp>
 
 extern EventLogger *g_eventLogger;

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
Thread
bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:4220) magnus.blaudd24 May