List:Commits« Previous MessageNext Message »
From:Vladislav Vaintroub Date:November 19 2010 10:20am
Subject:bzr push into mysql-trunk branch (vvaintroub:3358 to 3359)
View as plain text  
 3359 Vladislav Vaintroub	2010-11-19 [merge]
      merge

    modified:
      CMakeLists.txt
      cmake/build_configurations/mysql_release.cmake
 3358 Dmitry Lenev	2010-11-19 [merge]
      Merged recent changes from mysql-5.5-bugteam
      into mysql-trunk-bugfixing tree.

    modified:
      mysql-test/r/partition_innodb.result
      mysql-test/t/partition_innodb.test
      sql/event_queue.cc
      sql/sql_table.cc
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2010-11-13 22:18:46 +0000
+++ b/CMakeLists.txt	2010-11-19 10:19:11 +0000
@@ -79,12 +79,12 @@ ELSEIF(NOT HAVE_CMAKE_BUILD_TYPE OR OLD_
   SET(OLD_WITH_DEBUG 0 CACHE INTERNAL "" FORCE)
 ENDIF()
 
-IF(BUILD_CONFIG)
-  SET(CMAKE_USER_MAKE_RULES_OVERRIDE 
-    ${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake)
-ENDIF()
 
 PROJECT(MySQL)
+IF(BUILD_CONFIG)
+  INCLUDE(
+  ${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake)
+ENDIF()
 
 # Include the platform-specific file. To allow exceptions, this code
 # looks for files in order of how specific they are. If there is, for

=== modified file 'cmake/build_configurations/mysql_release.cmake'
--- a/cmake/build_configurations/mysql_release.cmake	2010-10-08 13:30:58 +0000
+++ b/cmake/build_configurations/mysql_release.cmake	2010-11-17 21:06:24 +0000
@@ -219,22 +219,4 @@ IF(UNIX)  
       ENDIF()
     ENDIF()
   ENDIF()
-
-  IF(CMAKE_C_FLAGS_DEBUG)
-    SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}"
-      CACHE STRING "Debug C compile flags")
-  ENDIF()
-  IF(CMAKE_CXX_FLAGS_DEBUG)
-    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}"
-      CACHE STRING "Debug C++ compile flags")
-  ENDIF()
-  IF(CMAKE_C_FLAGS_RELWITHDEBINFO)
-    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}"
-      CACHE STRING "RelWithDebInfo C compile flags")
-  ENDIF()
-  IF(CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}"
-      CACHE STRING "RelWithDebInfo C++ compile flags")
-  ENDIF()
-
 ENDIF()

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (vvaintroub:3358 to 3359) Vladislav Vaintroub19 Nov