152db2a96e
- New FPROFILE_GENERATE and FPROFILE_USE CMake options are available for experimenting with profile guided optimization (PGO) with GCC. See the cmake/fprofile.cmake in a MySQL source distribution for information about using them. These options have been tested with GCC 8 and 9, and with Clang. - Enabling FPROFILE_USE also enables WITH_LTO (link time optimization). - Innodb_system_rows_read, Innodb_system_rows_inserted, Innodb_system_rows_deleted status variables were added for counting row operations on InnoDB tables that belong to system-created schemas. The new status variables are similar to the existing Innodb_rows_read, Innodb_rows_inserted, Innodb_rows_deleted status variables, which count operations on InnoDB tables that belong to both user-created and system-created schemas. - The new status variables are useful in replication environments where relay_log_info_repository and master_info_repository variables are set to TABLE, resulting in higher row operation counts on slaves due to operations performed on the slave_master_info, slave_replay_log_info, and slave_worker_info tables, which belong to the system-created mysql schema. For a valid comparison of master and slave row operation counts, operations on tables in system-created schemas can now be excluded using the count data provided by the new status variables. More infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-19.html Submitted by: fluffy Approved by: mmokhi (maintainer, implicit) Sponsored by: Netzkommune GmbH
62 lines
2.2 KiB
Plaintext
62 lines
2.2 KiB
Plaintext
--- scripts/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC
|
|
+++ scripts/CMakeLists.txt
|
|
@@ -330,7 +330,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
|
|
LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS)
|
|
FOREACH(lib ${${target}_LIB_DEPENDS})
|
|
# Filter out "general", it is not a library, just CMake hint
|
|
- IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} ")
|
|
+ IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} " AND NOT lib STREQUAL "imported_openssl" AND NOT lib STREQUAL "imported_crypto")
|
|
IF (lib MATCHES "^\\-l")
|
|
SET(${var} "${${var}} ${lib} ")
|
|
ELSEIF (lib MATCHES "^\\-L")
|
|
@@ -340,6 +340,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
|
|
GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
|
|
STRING(REGEX REPLACE "^lib" "" lib "${lib}")
|
|
SET(${var} "${${var}}-l${lib} " )
|
|
+ ELSEIF(lib STREQUAL "-pthread")
|
|
+ SET(${var} "${${var}}-pthread " )
|
|
ELSE()
|
|
SET(${var} "${${var}}-l${lib} " )
|
|
ENDIF()
|
|
@@ -414,7 +416,7 @@ ELSE()
|
|
${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
|
|
ESCAPE_QUOTES @ONLY)
|
|
|
|
- IF(INSTALL_PKGCONFIGDIR)
|
|
+ IF(INSTALL_PKGCONFIGDIR AND NOT WITHOUT_CLIENTLIBS)
|
|
MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
|
|
INSTALL(FILES
|
|
${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
|
|
@@ -427,23 +429,28 @@ ELSE()
|
|
# mysqld_safe used in mtr even for systemd platforms
|
|
IF(WITH_SYSTEMD)
|
|
SET(BIN_SCRIPTS
|
|
- mysql_config
|
|
mysqldumpslow
|
|
mysqld_safe
|
|
)
|
|
ELSE()
|
|
SET(BIN_SCRIPTS
|
|
- mysql_config
|
|
mysqldumpslow
|
|
mysqld_multi
|
|
mysqld_safe
|
|
)
|
|
ENDIF()
|
|
|
|
+ IF(NOT WITHOUT_CLIENTLIBS)
|
|
+ SET(BIN_SCRIPTS
|
|
+ ${BIN_SCRIPTS}
|
|
+ mysql_config
|
|
+ )
|
|
+ ENDIF(NOT WITHOUT_CLIENTLIBS)
|
|
+
|
|
FOREACH(file ${BIN_SCRIPTS})
|
|
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
|
|
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
|
|
- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY
|
|
+ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY
|
|
)
|
|
ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.pl.in)
|
|
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.pl.in
|