342c784ae3
switch patch-files to mysql80-server to make it easy for maintain. Bugfix: - CMake now enables use of fastcov if it is available. fastcov is faster than lcov or gcov. This requires GCC and gcov versions of 9 or higher. - The DISABLE_SHARED CMake option was unused and has been removed. - The CMake code to find Protobuf executables now works on platforms that split these into multiple packages. - The new ADD_GDB_INDEX CMake option determines whether to enable generation of a .gdb_index section in binaries, which makes loading them in a debugger faster. The option is disabled by default. It has no effect if a linker other than lld or GNU gold is used. - For the INSTALL_LAYOUT CMake option, the SLES and WIN option values were not used and have been removed. - The max_prepared_stmt_count system variable maximum value has been increased from 1 million (1,048,576) to 4 million (4,194,304). The default value remains unchanged at 16,382. - MySQL 8.0 no longer supports building using wolfSSL. All MySQL builds now use OpenSSL. - The RE2 library is no longer used by MySQL. The library is no longer bundled with source distributions and the WITH_RE2 CMake option is obsolete. More Infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-18.html A big thanks to @fluffy for his help with this update MFH: 2020Q1 Security: fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf Sponsored by: Netzkommune GmbH
77 lines
1.9 KiB
Plaintext
77 lines
1.9 KiB
Plaintext
--- client/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC
|
|
+++ client/CMakeLists.txt
|
|
@@ -23,8 +23,11 @@
|
|
## Subdirectory with common client code.
|
|
ADD_SUBDIRECTORY(base)
|
|
## Subdirectory for mysqlpump code.
|
|
+IF(WITHOUT_SERVER)
|
|
ADD_SUBDIRECTORY(dump)
|
|
+ENDIF()
|
|
|
|
+IF(NOT WITHOUT_CLIENTLIBS)
|
|
MYSQL_ADD_EXECUTABLE(mysql
|
|
${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc
|
|
completion_hash.cc
|
|
@@ -33,6 +36,7 @@ MYSQL_ADD_EXECUTABLE(mysql
|
|
readline.cc
|
|
LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY}
|
|
)
|
|
+ENDIF()
|
|
|
|
IF(NOT WITHOUT_SERVER)
|
|
MYSQL_ADD_EXECUTABLE(mysql_upgrade
|
|
@@ -48,6 +52,7 @@ IF(SOLARIS_SPARC AND CMAKE_BUILD_TYPE_UPPER STREQUAL "
|
|
)
|
|
ENDIF()
|
|
|
|
+IF(NOT WITHOUT_SERVER)
|
|
MYSQL_ADD_EXECUTABLE(mysqltest
|
|
mysqltest.cc
|
|
mysqltest/error_names.cc
|
|
@@ -63,6 +68,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest
|
|
ENABLE_EXPORTS
|
|
LINK_LIBRARIES mysqlclient
|
|
)
|
|
+ENDIF()
|
|
+
|
|
+IF(WITHOUT_SERVER)
|
|
MYSQL_ADD_EXECUTABLE(mysqlcheck
|
|
check/mysqlcheck.cc
|
|
check/mysqlcheck_core.cc
|
|
@@ -80,6 +88,7 @@ MYSQL_ADD_EXECUTABLE(mysqlshow
|
|
mysqlshow.cc
|
|
LINK_LIBRARIES mysqlclient
|
|
)
|
|
+
|
|
MYSQL_ADD_EXECUTABLE(mysqlbinlog
|
|
mysqlbinlog.cc
|
|
${CMAKE_SOURCE_DIR}/sql/json_binary.cc
|
|
@@ -104,7 +113,9 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog
|
|
|
|
TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
|
|
TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)
|
|
+ENDIF()
|
|
|
|
+IF(WITHOUT_SERVER)
|
|
MYSQL_ADD_EXECUTABLE(mysqladmin
|
|
mysqladmin.cc
|
|
LINK_LIBRARIES mysqlclient
|
|
@@ -117,6 +128,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
|
|
mysql_config_editor.cc
|
|
LINK_LIBRARIES mysqlclient
|
|
)
|
|
+ENDIF()
|
|
+
|
|
+IF(NOT WITHOUT_SERVER)
|
|
MYSQL_ADD_EXECUTABLE(mysql_secure_installation
|
|
mysql_secure_installation.cc
|
|
LINK_LIBRARIES mysqlclient
|
|
@@ -127,6 +141,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
|
|
path.cc
|
|
LINK_LIBRARIES mysys
|
|
)
|
|
+ENDIF()
|
|
|
|
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
|
|
IF(WIN32)
|