Commit 16fd5b9b authored by Alexander Nozdrin's avatar Alexander Nozdrin

Auto-merge from mysql-next-mr.

parents f514df70 f381d58c
[MYSQL] [MYSQL]
post_commit_to = "commits@lists.mysql.com" post_commit_to = "commits@lists.mysql.com"
post_push_to = "commits@lists.mysql.com" post_push_to = "commits@lists.mysql.com"
tree_name = "mysql-next-mr-bugfixing" tree_name = "mysql-next-mr"
...@@ -278,6 +278,7 @@ ENDIF() ...@@ -278,6 +278,7 @@ ENDIF()
SET(MYSQL_DOCS_LOCATION "" CACHE PATH "Location from where documentation is copied") SET(MYSQL_DOCS_LOCATION "" CACHE PATH "Location from where documentation is copied")
MARK_AS_ADVANCED(MYSQL_DOCS_LOCATION) MARK_AS_ADVANCED(MYSQL_DOCS_LOCATION)
INSTALL(DIRECTORY Docs/ DESTINATION ${INSTALL_DOCDIR} INSTALL(DIRECTORY Docs/ DESTINATION ${INSTALL_DOCDIR}
PATTERN "INSTALL-BINARY" EXCLUDE
PATTERN "Makefile.*" EXCLUDE PATTERN "Makefile.*" EXCLUDE
PATTERN "myisam.txt" EXCLUDE PATTERN "myisam.txt" EXCLUDE
PATTERN "glibc*" EXCLUDE PATTERN "glibc*" EXCLUDE
......
EXTRA_DIST = \ EXTRA_DIST = \
cmake_parse_arguments.cmake \ cmake_parse_arguments.cmake \
cpack_source_ignore_files.cmake \
package_name.cmake \ package_name.cmake \
configurable_file_content.in \ configurable_file_content.in \
check_minimal_version.cmake \ check_minimal_version.cmake \
......
...@@ -80,6 +80,8 @@ IF(FEATURE_SET) ...@@ -80,6 +80,8 @@ IF(FEATURE_SET)
ENDFOREACH() ENDFOREACH()
ENDIF() ENDIF()
SET(WITHOUT_AUDIT_NULL ON CACHE BOOL "")
SET(WITHOUT_DAEMON_EXAMPLE ON CACHE BOOL "")
OPTION(ENABLE_LOCAL_INFILE "" ON) OPTION(ENABLE_LOCAL_INFILE "" ON)
SET(WITH_SSL bundled CACHE STRING "") SET(WITH_SSL bundled CACHE STRING "")
......
...@@ -130,12 +130,12 @@ foreach my $option (@ARGV) ...@@ -130,12 +130,12 @@ foreach my $option (@ARGV)
} }
if($option =~ /with-ssl=/) if($option =~ /with-ssl=/)
{ {
$cmakeargs = $cmakeargs." -DWITH_SSL=bundled"; $cmakeargs = $cmakeargs." -DWITH_SSL=yes";
next; next;
} }
if($option =~ /with-ssl/) if($option =~ /with-ssl/)
{ {
$cmakeargs = $cmakeargs." -DWITH_SSL=yes"; $cmakeargs = $cmakeargs." -DWITH_SSL=bundled";
next; next;
} }
if($option =~ /prefix=/) if($option =~ /prefix=/)
......
SET(CPACK_SOURCE_IGNORE_FILES
\\\\.bzr/
\\\\.bzr-mysql
\\\\.bzrignore
CMakeCache\\\\.txt
cmake_dist\\\\.cmake
CPackSourceConfig\\\\.cmake
CPackConfig.cmake
/cmake_install\\\\.cmake
/CTestTestfile\\\\.cmake
/CMakeFiles/
/version_resources/
/_CPack_Packages/
$\\\\.gz
$\\\\.zip
/CMakeFiles/
/version_resources/
/_CPack_Packages/
scripts/make_binary_distribution$
scripts/msql2mysql$
scripts/mysql_config$
scripts/mysql_convert_table_format$
scripts/mysql_find_rows$
scripts/mysql_fix_extensions$
scripts/mysql_install_db$
scripts/mysql_secure_installation$
scripts/mysql_setpermission$
scripts/mysql_zap$
scripts/mysqlaccess$
scripts/mysqld_multi$
scripts/mysqld_safe$
scripts/mysqldumpslow$
scripts/mysqlhotcopy$
Makefile$
include/config\\\\.h$
include/my_config\\\\.h$
/autom4te\\\\.cache/
errmsg\\\\.sys$
#
)
...@@ -72,8 +72,29 @@ IF(ENABLE_DTRACE) ...@@ -72,8 +72,29 @@ IF(ENABLE_DTRACE)
) )
ENDIF() ENDIF()
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX
AND CMAKE_SIZEOF_VOID_P EQUAL 4)
IF(NOT DEFINED BUGGY_GCC_NO_DTRACE_MODULES)
EXECUTE_PROCESS(
COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} --version
OUTPUT_VARIABLE out)
IF(out MATCHES "3.4.6")
# This gcc causes crashes in dlopen() for dtraced shared libs,
# while standard shipped with Solaris10 3.4.3 is ok
SET(BUGGY_GCC_NO_DTRACE_MODULES 1 CACHE INTERNAL "")
ELSE()
SET(BUGGY_GCC_NO_DTRACE_MODULES 0 CACHE INTERNAL "")
ENDIF()
ENDIF()
ENDIF()
MACRO(DTRACE_INSTRUMENT target) FUNCTION(DTRACE_INSTRUMENT target)
IF(BUGGY_GCC_NO_DTRACE_MODULES)
GET_TARGET_PROPERTY(target_type ${target} TYPE)
IF(target_type MATCHES "MODULE_LIBRARY")
RETURN()
ENDIF()
ENDIF()
IF(ENABLE_DTRACE) IF(ENABLE_DTRACE)
ADD_DEPENDENCIES(${target} gen_dtrace_header) ADD_DEPENDENCIES(${target} gen_dtrace_header)
...@@ -119,7 +140,7 @@ MACRO(DTRACE_INSTRUMENT target) ...@@ -119,7 +140,7 @@ MACRO(DTRACE_INSTRUMENT target)
ENDIF() ENDIF()
ENDIF() ENDIF()
ENDIF() ENDIF()
ENDMACRO() ENDFUNCTION()
# Ugly workaround for Solaris' DTrace inability to use probes # Ugly workaround for Solaris' DTrace inability to use probes
......
...@@ -80,7 +80,7 @@ ENDIF() ...@@ -80,7 +80,7 @@ ENDIF()
SET(INSTALL_LIBDIR_STANDALONE "lib") SET(INSTALL_LIBDIR_STANDALONE "lib")
SET(INSTALL_INCLUDEDIR_STANDALONE "include") SET(INSTALL_INCLUDEDIR_STANDALONE "include")
SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin") SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin")
SET(INSTALL_DOCDIR_STANDALONE "doc") SET(INSTALL_DOCDIR_STANDALONE "docs")
SET(INSTALL_MANDIR_STANDALONE "man") SET(INSTALL_MANDIR_STANDALONE "man")
SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share") SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share")
SET(INSTALL_SHAREDIR_STANDALONE "share") SET(INSTALL_SHAREDIR_STANDALONE "share")
......
...@@ -108,17 +108,7 @@ IF(NOT CPACK_SOURCE_PACKAGE_FILE_NAME) ...@@ -108,17 +108,7 @@ IF(NOT CPACK_SOURCE_PACKAGE_FILE_NAME)
ENDIF() ENDIF()
SET(CPACK_PACKAGE_VENDOR "Sun Microsystems, Inc") SET(CPACK_PACKAGE_VENDOR "Sun Microsystems, Inc")
SET(CPACK_SOURCE_GENERATOR "TGZ") SET(CPACK_SOURCE_GENERATOR "TGZ")
SET(CPACK_SOURCE_IGNORE_FILES INCLUDE(cpack_source_ignore_files)
\\\\.bzr/
\\\\.bzr-mysql
.bzrignore
CMakeCache.txt
/CMakeFiles/
/version_resources/
/_CPack_Packages/
$.gz
$.zip
)
# Defintions for windows version resources # Defintions for windows version resources
SET(PRODUCTNAME "MySQL Server") SET(PRODUCTNAME "MySQL Server")
......
...@@ -30,7 +30,7 @@ SET(LIBM m) ...@@ -30,7 +30,7 @@ SET(LIBM m)
# CMake defined -lthread as thread flag. This crashes in dlopen # CMake defined -lthread as thread flag. This crashes in dlopen
# when trying to load plugins workaround with -lpthread # when trying to load plugins workaround with -lpthread
SET(CMAKE_THREADS_LIBS_INIT -lpthread CACHE INTERNAL "") SET(CMAKE_THREADS_LIBS_INIT -lpthread CACHE INTERNAL "" FORCE)
# Solaris specific large page support # Solaris specific large page support
CHECK_SYMBOL_EXISTS(MHA_MAPSIZE_VA sys/mman.h HAVE_DECL_MHA_MAPSIZE_VA) CHECK_SYMBOL_EXISTS(MHA_MAPSIZE_VA sys/mman.h HAVE_DECL_MHA_MAPSIZE_VA)
......
...@@ -23,6 +23,7 @@ INSTALL( ...@@ -23,6 +23,7 @@ INSTALL(
PATTERN "mtr.out*" EXCLUDE PATTERN "mtr.out*" EXCLUDE
PATTERN ".cvsignore" EXCLUDE PATTERN ".cvsignore" EXCLUDE
PATTERN "*.am" EXCLUDE PATTERN "*.am" EXCLUDE
PATTERN "*.in" EXCLUDE
) )
......
...@@ -192,6 +192,13 @@ ADD_CUSTOM_COMMAND( ...@@ -192,6 +192,13 @@ ADD_CUSTOM_COMMAND(
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gen_lex_hash.cc) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gen_lex_hash.cc)
MYSQL_ADD_EXECUTABLE(mysql_tzinfo_to_sql tztime.cc)
SET_TARGET_PROPERTIES(mysql_tzinfo_to_sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL")
TARGET_LINK_LIBRARIES(mysql_tzinfo_to_sql ${MYSQLD_STATIC_PLUGIN_LIBS}
mysys dbug strings vio regex
${LIBWRAP} ${LIBCRYPT} ${LIBDL}
${SSL_LIBRARIES})
ADD_CUSTOM_TARGET( ADD_CUSTOM_TARGET(
GenServerSource GenServerSource
DEPENDS ${GEN_SOURCES} DEPENDS ${GEN_SOURCES}
......
...@@ -47,6 +47,8 @@ FOREACH (dir ${dirs}) ...@@ -47,6 +47,8 @@ FOREACH (dir ${dirs})
INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dir} INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dir}
DESTINATION ${INSTALL_MYSQLSHAREDIR}) DESTINATION ${INSTALL_MYSQLSHAREDIR})
ENDFOREACH() ENDFOREACH()
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets DESTINATION ${INSTALL_MYSQLSHAREDIR}) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets DESTINATION ${INSTALL_MYSQLSHAREDIR}
PATTERN "languages.html" EXCLUDE
)
INSTALL(FILES ${files} DESTINATION ${INSTALL_MYSQLSHAREDIR}) INSTALL(FILES ${files} DESTINATION ${INSTALL_MYSQLSHAREDIR})
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment