List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:September 21 2011 12:47pm
Subject:bzr push into mysql-trunk branch (tor.didriksen:3444 to 3445)
View as plain text  
 3445 Tor Didriksen	2011-09-21
      Revert some cmake debugging.
      Fix list of exported symbols in create_def_file.js

    modified:
      cmake/os/Windows.cmake
      sql/CMakeLists.txt
      win/create_def_file.js
 3444 Tor Didriksen	2011-09-20
      testing windows

    modified:
      cmake/os/Windows.cmake
      sql/CMakeLists.txt
      sql/field.h
=== modified file 'cmake/os/Windows.cmake'
--- a/cmake/os/Windows.cmake	2011-09-20 16:35:34 +0000
+++ b/cmake/os/Windows.cmake	2011-09-21 12:46:39 +0000
@@ -54,7 +54,6 @@ ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D
 ADD_DEFINITIONS("-D_WIN32_WINNT=0x0501")
 # Speed up build process excluding unused header files
 ADD_DEFINITIONS("-DWIN32_LEAN_AND_MEAN")
-ADD_DEFINITIONS(/EHcs)
   
 # Adjust compiler and linker flags
 IF(MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 4)
@@ -79,7 +78,7 @@ IF(MSVC)
    CMAKE_CXX_FLAGS_RELEASE  CMAKE_CXX_FLAGS_RELWITHDEBINFO
    CMAKE_CXX_FLAGS_DEBUG  CMAKE_CXX_FLAGS_DEBUG_INIT)
    STRING(REPLACE "/MD"  "/MT" "${flag}" "${${flag}}")
-   MESSAGE(STATUS "flag ${flag} ${${flag}}")
+   SET("${flag}" "${${flag}} /EHcs")
   ENDFOREACH()
   
   # Remove support for exceptions

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2011-09-20 16:35:34 +0000
+++ b/sql/CMakeLists.txt	2011-09-21 12:46:39 +0000
@@ -294,10 +294,6 @@ IF(WITH_MYSQLD_LDFLAGS)
      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
 ENDIF()
 
-GET_TARGET_PROPERTY(foo mysqld LINK_FLAGS)
-MESSAGE(STATUS "mysqld link flags: ${foo}")
-MESSAGE(STATUS "mysqld_link_flags ${mysqld_link_flags}")
-
 IF(DEBUG_EXTNAME)
   INSTALL_DEBUG_TARGET(mysqld 
     DESTINATION ${INSTALL_SBINDIR} 

=== modified file 'win/create_def_file.js'
--- a/win/create_def_file.js	2011-06-30 15:46:53 +0000
+++ b/win/create_def_file.js	2011-09-21 12:46:39 +0000
@@ -169,6 +169,10 @@ function ScrubSymbol(symbol)
 function IsCompilerDefinedSymbol(symbol)
 {
     return ((symbol.indexOf("__real@") != -1) ||
+    (symbol.indexOf("_CTA2?") != -1) ||        // std::bad_alloc
+    (symbol.indexOf("_CTA3?") != -1) ||        // std::length_error
+    (symbol.indexOf("_TI2?") != -1) ||         // std::bad_alloc
+    (symbol.indexOf("_TI3?") != -1) ||         // std::length_error
     (symbol.indexOf("_RTC_") != -1) || 
     (symbol.indexOf("??_C@_") != -1) ||
     (symbol.indexOf("??_R") != -1) ||

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (tor.didriksen:3444 to 3445) Tor Didriksen22 Sep