19679c5f4e
- Performance: Certain queries against tables with spatial indexes were not performed as efficiently following an upgrade from MySQL 5.7 to MySQL 8.0. - NDB Cluster: NDB defines one SPJ worker per node owning a primary partition of the root table. If this table used read from any replica, DBTC put all SPJ workers in the same DBSPJ instance, which effe - NDB Cluster: Executing the SHOW command using an ndb_mgm client binary from NDB 8.0.16 or earlier to access a management node running NDB 8.0.17 or later produced the error message Unknown field: is_s - On EL7 and EL8, CMake configuration was adjusted to look for GCC 9 before GCC 8. Because libmysqlclient ships with MySQL distributions, client applications built against libmysqlclient on those platfo - The max_length_for_sort_data system variable is now deprecated due to optimizer changes that make it obsolete and of no effect. More Infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-20.html Special thanks to: fluffy MFH: 2020Q2 Security: 21d59ea3-8559-11ea-a5e2-d4c9ef517024 (MySQL - Server) Security: 622b5c47-855b-11ea-a5e2-d4c9ef517024 (MySQL - Client) Sponsored by: Netzkommune GmbH
70 lines
2.3 KiB
Plaintext
70 lines
2.3 KiB
Plaintext
--- libmysql/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC
|
|
+++ libmysql/CMakeLists.txt
|
|
@@ -192,6 +192,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
|
|
)
|
|
ENDIF()
|
|
|
|
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
|
|
+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
|
+ ADD_COMPILE_FLAGS(${CLIENT_SOURCES} COMPILE_FLAGS "-fPIC")
|
|
+ENDIF()
|
|
+
|
|
#
|
|
# Include protocol tracing infrastructure and the test
|
|
# trace plugin if enabled by build options.
|
|
@@ -242,11 +247,18 @@ IF(WIN32)
|
|
LIST(APPEND LIBS_TO_MERGE auth_win_client)
|
|
ENDIF()
|
|
|
|
-# LDAP authentication SASL client plugin
|
|
-ADD_SUBDIRECTORY(authentication_ldap)
|
|
+IF(WITHOUT_CLIENTLIBS)
|
|
+ # Merge several convenience libraries into one big mysqlclient
|
|
+ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
|
|
+ELSE(WITHOUT_CLIENTLIBS)
|
|
+ # LDAP authentication SASL client plugin
|
|
+ MESSAGE(STATUS "Creating LDAP authentication SASL client library.")
|
|
+ ADD_SUBDIRECTORY(authentication_ldap)
|
|
|
|
-# Merge several convenience libraries into one big mysqlclient
|
|
-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
|
|
+ # Merge several convenience libraries into one big mysqlclient
|
|
+ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
|
|
+ENDIF(WITHOUT_CLIENTLIBS)
|
|
+
|
|
TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK})
|
|
|
|
# Visual Studio users need debug static library for debug projects
|
|
@@ -281,12 +291,22 @@ ENDIF()
|
|
|
|
# Merge several convenience libraries into one big mysqlclient
|
|
# and link them together into shared library.
|
|
+IF(WITHOUT_CLIENTLIBS)
|
|
MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
|
|
EXPORTS
|
|
${CLIENT_API_FUNCTIONS}
|
|
${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
|
|
${CLIENT_API_NONBLOCKING_FUNCTIONS}
|
|
+ COMPONENT SharedLibraries
|
|
+ SKIP_INSTALL )
|
|
+ELSE(WITHOUT_CLIENTLIBS)
|
|
+MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
|
|
+ EXPORTS
|
|
+ ${CLIENT_API_FUNCTIONS}
|
|
+ ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
|
|
+ ${CLIENT_API_NONBLOCKING_FUNCTIONS}
|
|
COMPONENT SharedLibraries)
|
|
+ENDIF(WITHOUT_CLIENTLIBS)
|
|
TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK})
|
|
|
|
IF(WIN32)
|
|
@@ -300,7 +320,7 @@ ENDIF()
|
|
|
|
IF(UNIX)
|
|
# libtool compatability
|
|
- IF(FREEBSD OR APPLE)
|
|
+ IF(FREEBSD OR APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly")
|
|
SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
|
|
ELSE()
|
|
SET(OS_SHARED_LIB_VERSION
|