List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:January 26 2011 9:14am
Subject:bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:4062)
View as plain text  
#At file:///home/msvensson/mysql/tmp/xCB2JIAhr9/7.1/ based on revid:martin.skold@strippedba1e4n74

 4062 Magnus Blåudd	2011-01-26 [merge]
      Merge 7.0 -> 7.1

    modified:
      CMakeLists.txt
      cmake/mysql_version.cmake
      storage/ndb/include/CMakeLists.txt
      storage/ndb/src/kernel/CMakeLists.txt
      storage/ndb/src/kernel/blocks/CMakeLists.txt
      storage/ndb/src/kernel/blocks/backup/CMakeLists.txt
      storage/ndb/src/kernel/blocks/dbdict/CMakeLists.txt
      storage/ndb/src/kernel/blocks/dbdih/CMakeLists.txt
      storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt
      storage/ndb/src/mgmclient/CMakeLists.txt
      storage/ndb/src/mgmsrv/CMakeLists.txt
      storage/ndb/tools/CMakeLists.txt
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2010-08-30 14:10:58 +0000
+++ b/CMakeLists.txt	2011-01-26 08:54:07 +0000
@@ -23,6 +23,14 @@ PROJECT(MySql)
 # This reads user configuration, generated by configure.js.
 INCLUDE(win/configure.data)
 
+# MCP_CMAKE_COMPATIBILITY_55 ->
+SET(CMAKE_MODULE_PATH ${CMAKE_MODUL_PATH} ${CMAKE_SOURCE_DIR}/cmake)
+INCLUDE(mysql_version)
+INCLUDE(install_layout)
+INCLUDE(install_macros)
+INCLUDE(mysql_add_executable)
+# MCP_CMAKE_COMPATIBILITY_55 <-
+
 # Hardcode support for CSV storage engine
 SET(WITH_CSV_STORAGE_ENGINE TRUE)
 

=== modified file 'cmake/mysql_version.cmake'
--- a/cmake/mysql_version.cmake	2010-11-09 14:33:15 +0000
+++ b/cmake/mysql_version.cmake	2011-01-24 12:27:41 +0000
@@ -41,7 +41,11 @@ MACRO(GET_MYSQL_VERSION)
         STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION_STRING "${str}")
         IF(NOT VERSION_STRING)
           FILE(STRINGS  configure.in  str REGEX "AC_INIT\\(")
+          IF(NOT MCP_BUG57843)
+            STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+[-.a-zAZ0-9]+" VERSION_STRING "${str}")
+          ELSEIF()
           STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+[-][a-zAZ0-9]+" VERSION_STRING "${str}")
+          ENDIF()
         ENDIF()
       ENDIF()
     ENDIF()

=== modified file 'storage/ndb/include/CMakeLists.txt'
--- a/storage/ndb/include/CMakeLists.txt	2010-08-04 14:00:24 +0000
+++ b/storage/ndb/include/CMakeLists.txt	2011-01-26 08:45:32 +0000
@@ -26,29 +26,49 @@ CONFIGURE_FILE(ndb_types.h.in
                @ONLY)
 
 #
+# Read a value for variable from ndb_configure.m4
+#
+MACRO(NDB_GET_CONFIG_VALUE keyword var)
+ IF(NOT ${var})
+   # Read the line which contains the keyword
+   FILE (STRINGS ${NDB_SOURCE_DIR}/ndb_configure.m4 str
+         REGEX "^[ ]*${keyword}=")
+   IF(str)
+     # Remove the keyword=
+     STRING(REPLACE "${keyword}=" "" str ${str})
+     # Remove whitespace
+     STRING(REGEX REPLACE "[ ].*" "" str "${str}")
+     SET(${var} ${str})
+   ENDIF()
+ ENDIF()
+ENDMACRO()
+
+#
 # Read ndb_configure.m4 and extract the NDB_VERSION_XX=YY variables
 #
-FILE(READ "${CMAKE_SOURCE_DIR}/storage/ndb/ndb_configure.m4" CONFIGURE_IN)
 
-# NDB_VERSION_MAJOR
-STRING(REGEX REPLACE ".*NDB_VERSION_MAJOR=([0-9]+).*"
-        "\\1" PARSE_NDB_VERSION_MAJOR "${CONFIGURE_IN}")
-SET(NDB_VERSION_MAJOR "${PARSE_NDB_VERSION_MAJOR}" CACHE STRING "NDB Major Version" FORCE)
-
-# NDB_VERSION_MINOR
-STRING(REGEX REPLACE ".*NDB_VERSION_MINOR=([0-9]+).*"
-        "\\1" PARSE_NDB_VERSION_MINOR "${CONFIGURE_IN}")
-SET(NDB_VERSION_MINOR "${PARSE_NDB_VERSION_MINOR}" CACHE STRING "NDB Minor Version" FORCE)
-
-# NDB_VERSION_BUILD
-STRING(REGEX REPLACE ".*NDB_VERSION_BUILD=([0-9]+).*"
-        "\\1" PARSE_NDB_VERSION_BUILD "${CONFIGURE_IN}")
-SET(NDB_VERSION_BUILD "${PARSE_NDB_VERSION_BUILD}" CACHE STRING "NDB Build Version" FORCE)
-
-# NDB_VERSION_STATUS               
-STRING(REGEX REPLACE ".*NDB_VERSION_STATUS=\"([^\"]+)\".*"
-        "\\1" PARSE_NDB_VERSION_STATUS "${CONFIGURE_IN}")
-SET(NDB_VERSION_STATUS "${NDB_VERSION_STATUS}" CACHE STRING "NDB Status Version" FORCE)
+NDB_GET_CONFIG_VALUE(NDB_VERSION_MAJOR major)
+SET(NDB_VERSION_MAJOR "${major}" CACHE INTERNAL "NDB Major Version" FORCE)
+
+NDB_GET_CONFIG_VALUE(NDB_VERSION_MINOR minor)
+SET(NDB_VERSION_MINOR "${minor}" CACHE INTERNAL "NDB Minor Version" FORCE)
+
+NDB_GET_CONFIG_VALUE(NDB_VERSION_BUILD build)
+SET(NDB_VERSION_BUILD "${build}" CACHE INTERNAL "NDB Build Version" FORCE)
+
+NDB_GET_CONFIG_VALUE(NDB_VERSION_STATUS status)
+# Trim surrounding "'s from status
+STRING(REGEX REPLACE "\"" "" status "${status}")
+SET(NDB_VERSION_STATUS "${status}" CACHE INTERNAL "NDB Status Version" FORCE)
+
+IF(NOT DEFINED NDB_VERSION_MAJOR OR
+   NOT DEFINED NDB_VERSION_MINOR OR
+   NOT DEFINED NDB_VERSION_BUILD)
+  MESSAGE(STATUS "NDB_VERSION_MAJOR: ${NDB_VERSION_MAJOR}")
+  MESSAGE(STATUS "NDB_VERSION_MINOR: ${NDB_VERSION_MINOR}")
+  MESSAGE(STATUS "NDB_VERSION_BUILD: ${NDB_VERSION_BUILD}")
+  MESSAGE(FATAL_ERROR "Couldn't parse version numbers from ndb_configure.m4")
+ENDIF()
 
 # Create ndb_version.h
 CONFIGURE_FILE(ndb_version.h.in

=== modified file 'storage/ndb/src/kernel/CMakeLists.txt'
--- a/storage/ndb/src/kernel/CMakeLists.txt	2010-11-10 14:45:18 +0000
+++ b/storage/ndb/src/kernel/CMakeLists.txt	2011-01-26 08:54:07 +0000
@@ -52,14 +52,16 @@ IF(WIN32)
     ${CMAKE_SOURCE_DIR}/storage/ndb/src/common/logger/msg00001.bin)
 ENDIF()
 
-ADD_EXECUTABLE(ndbd
-  main.cpp ndbd.cpp angel.cpp SimBlockList.cpp ${NDBD_EXTRA_SRC})
+MYSQL_ADD_EXECUTABLE(ndbd
+  main.cpp ndbd.cpp angel.cpp SimBlockList.cpp ${NDBD_EXTRA_SRC}
+  DESTINATION ${INSTALL_SBINDIR}
+  COMPONENT ClusterDataNode)
 TARGET_LINK_LIBRARIES(ndbd ${NDBD_LIBS} ndbsched ${LIBDL})
-INSTALL(TARGETS ndbd DESTINATION libexec)
 
 IF(NDB_BUILD_NDBMTD)
-  ADD_EXECUTABLE(ndbmtd
-    main.cpp ndbd.cpp angel.cpp SimBlockList.cpp ${NDBD_EXTRA_SRC})
+  MYSQL_ADD_EXECUTABLE(ndbmtd
+    main.cpp ndbd.cpp angel.cpp SimBlockList.cpp ${NDBD_EXTRA_SRC}
+    DESTINATION ${INSTALL_SBINDIR}
+    COMPONENT ClusterDataNode)
   TARGET_LINK_LIBRARIES(ndbmtd ${NDBD_LIBS} ndbsched_mt ${LIBDL})
-  INSTALL(TARGETS ndbmtd DESTINATION libexec)
 ENDIF()

=== modified file 'storage/ndb/src/kernel/blocks/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/CMakeLists.txt	2010-11-08 16:26:18 +0000
+++ b/storage/ndb/src/kernel/blocks/CMakeLists.txt	2011-01-26 08:54:07 +0000
@@ -72,9 +72,9 @@ ADD_LIBRARY(ndbblocks STATIC
     dbtup/DbtupClient.cpp
     ${EXTRA_SRC})
 
-ADD_EXECUTABLE(ndb_print_file
-    print_file.cpp
-    diskpage.cpp
-    dbtup/tuppage.cpp
-)
+MYSQL_ADD_EXECUTABLE(ndb_print_file
+  print_file.cpp
+  diskpage.cpp
+  dbtup/tuppage.cpp
+  COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_print_file ndbclient)

=== modified file 'storage/ndb/src/kernel/blocks/backup/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/backup/CMakeLists.txt	2010-11-26 10:42:53 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/CMakeLists.txt	2011-01-26 08:54:07 +0000
@@ -13,6 +13,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-ADD_EXECUTABLE(ndb_print_backup_file read.cpp)
+MYSQL_ADD_EXECUTABLE(ndb_print_backup_file
+  read.cpp
+  COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_print_backup_file
     ndbtrace ndblogger ndbgeneral ndbportlib)

=== modified file 'storage/ndb/src/kernel/blocks/dbdict/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dbdict/CMakeLists.txt	2010-11-26 10:42:53 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdict/CMakeLists.txt	2011-01-26 08:54:07 +0000
@@ -13,7 +13,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-ADD_EXECUTABLE(ndb_print_schema_file
-               printSchemaFile.cpp)
+MYSQL_ADD_EXECUTABLE(ndb_print_schema_file
+  printSchemaFile.cpp
+  COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_print_schema_file
     ndbtrace ndblogger ndbgeneral ndbportlib)

=== modified file 'storage/ndb/src/kernel/blocks/dbdih/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dbdih/CMakeLists.txt	2010-11-26 10:42:53 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/CMakeLists.txt	2011-01-26 08:54:07 +0000
@@ -14,6 +14,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-ADD_EXECUTABLE(ndb_print_sys_file printSysfile.cpp)
+MYSQL_ADD_EXECUTABLE(ndb_print_sys_file
+  printSysfile.cpp
+  COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_print_sys_file
     ndbtrace ndblogger ndbgeneral ndbportlib)

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt	2010-11-26 10:42:53 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt	2011-01-26 08:54:07 +0000
@@ -14,8 +14,9 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-ADD_EXECUTABLE(ndb_redo_log_reader
-    redoLogReader/records.cpp
-    redoLogReader/reader.cpp)
+MYSQL_ADD_EXECUTABLE(ndb_redo_log_reader
+  redoLogReader/records.cpp
+  redoLogReader/reader.cpp
+  COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_redo_log_reader
     ndbtrace ndblogger ndbgeneral ndbportlib)

=== modified file 'storage/ndb/src/mgmclient/CMakeLists.txt'
--- a/storage/ndb/src/mgmclient/CMakeLists.txt	2010-11-10 09:42:49 +0000
+++ b/storage/ndb/src/mgmclient/CMakeLists.txt	2011-01-26 08:54:07 +0000
@@ -18,8 +18,9 @@ INCLUDE_DIRECTORIES(${NDB_SOURCE_DIR}/sr
 ADD_LIBRARY(ndbmgmclient STATIC
             CommandInterpreter.cpp)
 
-ADD_EXECUTABLE(ndb_mgm
-               main.cpp)
+MYSQL_ADD_EXECUTABLE(ndb_mgm
+  main.cpp
+  COMPONENT ClusterManagementClient)
 
 TARGET_LINK_LIBRARIES(ndb_mgm
                ndbmgmclient
@@ -34,5 +35,3 @@ TARGET_LINK_LIBRARIES(ndb_mgm
 IF(UNIX)
   TARGET_LINK_LIBRARIES(ndb_mgm ${READLINE_LIBRARY})
 ENDIF(UNIX)
-
-INSTALL(TARGETS ndb_mgm DESTINATION bin)

=== modified file 'storage/ndb/src/mgmsrv/CMakeLists.txt'
--- a/storage/ndb/src/mgmsrv/CMakeLists.txt	2010-11-11 15:10:05 +0000
+++ b/storage/ndb/src/mgmsrv/CMakeLists.txt	2011-01-26 09:14:08 +0000
@@ -48,15 +48,16 @@ IF(WIN32)
     ${CMAKE_SOURCE_DIR}/storage/ndb/src/common/logger/msg00001.bin)
 ENDIF()
 
-ADD_EXECUTABLE(ndb_mgmd
-  MgmtSrvr.cpp main.cpp Services.cpp ConfigManager.cpp ${NDB_MGMD_EXTRA_SRC})
+MYSQL_ADD_EXECUTABLE(ndb_mgmd
+  MgmtSrvr.cpp main.cpp Services.cpp ConfigManager.cpp
+  ${NDB_MGMD_EXTRA_SRC}
+  DESTINATION ${INSTALL_SBINDIR}
+  COMPONENT ClusterManagementServer)
 TARGET_LINK_LIBRARIES(ndb_mgmd ndbconf ndbclient ndbmgmclient)
 IF(UNIX)
   TARGET_LINK_LIBRARIES(ndb_mgmd ${READLINE_LIBRARY})
 ENDIF(UNIX)
 
-INSTALL(TARGETS ndb_mgmd DESTINATION libexec)
-
 ADD_EXECUTABLE(MgmConfig-t
                testConfig.cpp)
 TARGET_LINK_LIBRARIES(MgmConfig-t

=== modified file 'storage/ndb/tools/CMakeLists.txt'
--- a/storage/ndb/tools/CMakeLists.txt	2010-11-15 14:18:10 +0000
+++ b/storage/ndb/tools/CMakeLists.txt	2011-01-26 08:54:07 +0000
@@ -18,30 +18,58 @@ INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbapi)
 
-ADD_EXECUTABLE(ndb_waiter waiter.cpp)
+MYSQL_ADD_EXECUTABLE(ndb_waiter
+  waiter.cpp
+  COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_waiter ndbportlib ndbNDBT)
-ADD_EXECUTABLE(ndb_drop_table drop_tab.cpp)
+
+MYSQL_ADD_EXECUTABLE(ndb_drop_table
+  drop_tab.cpp
+  COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_drop_table ndbNDBT ndbgeneral)
-ADD_EXECUTABLE(ndb_delete_all delete_all.cpp)
+
+MYSQL_ADD_EXECUTABLE(ndb_delete_all
+  delete_all.cpp
+  COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_delete_all ndbNDBT)
-ADD_EXECUTABLE(ndb_desc desc.cpp)
+
+MYSQL_ADD_EXECUTABLE(ndb_desc
+  desc.cpp
+  COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_desc ndbNDBT)
-ADD_EXECUTABLE(ndb_drop_index drop_index.cpp)
+
+MYSQL_ADD_EXECUTABLE(ndb_drop_index
+  drop_index.cpp
+  COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_drop_index ndbNDBT)
-ADD_EXECUTABLE(ndb_show_tables listTables.cpp)
+
+MYSQL_ADD_EXECUTABLE(ndb_show_tables
+  listTables.cpp
+  COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_show_tables ndbclient ndbNDBT)
-ADD_EXECUTABLE(ndb_select_all select_all.cpp)
+
+MYSQL_ADD_EXECUTABLE(ndb_select_all
+  select_all.cpp
+  COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_select_all ndbNDBT)
-ADD_EXECUTABLE(ndb_select_count select_count.cpp)
+
+MYSQL_ADD_EXECUTABLE(ndb_select_count
+  select_count.cpp
+  COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_select_count ndbNDBT)
-ADD_EXECUTABLE(ndb_restore
-               restore/restore_main.cpp
-               restore/consumer.cpp
-               restore/consumer_restore.cpp
-               restore/consumer_printer.cpp
-               restore/Restore.cpp)
+
+MYSQL_ADD_EXECUTABLE(ndb_restore
+  restore/restore_main.cpp
+  restore/consumer.cpp
+  restore/consumer_restore.cpp
+  restore/consumer_printer.cpp
+  restore/Restore.cpp
+  COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_restore ndbNDBT ndbgeneral)
-ADD_EXECUTABLE(ndb_config ndb_config.cpp)
+
+MYSQL_ADD_EXECUTABLE(ndb_config
+  ndb_config.cpp
+  COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_config ndbmgmclient ndbconf)
 
 SET(options "-I${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmapi")

No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:4062) Magnus Blåudd26 Jan