ports/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt
Mahdi Mokhtari dcc891e0be databases/mysql80-{client, server}: Update to latest release 8.0.14
This update (released on Jan 21st) includes:
Bugs Fixed:
  Important Change: Fix importing a dump from a MySQL 5.7 server 8.0 failure.
    (ER_WRONG_VALUE_FOR_VAR, when an unsupported [by 8.0] SQL mode was used).
    The behavior of the server in such circumstances now depends on the setting of the
    `pseudo_slave_mode` system variable.
    If this is false, the server rejects the mode setting with ER_UNSUPPORTED_SQL_MODE.
    Otherwise, server just gives a warning. (Bug #90337, Bug #27828236).

  InnoDB: Properly initialize the static thread-local 'tables' variable in
    the TempTable storage engine (on Solaris X86) was not properly initialized.
    (Bug #28987365)

  InnoDB: Fix incorrect lock order caused a deadlock when one thread attempted to
    drop a table while another created an encrypted tablespace. (Bug #28774259)

More info from upstream:
  https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-14.html

While here, Adapt some local patches with new upstream changes.

PR:		234984
Sponsored by:	The FreeBSD Foundation
2019-01-26 18:36:14 +00:00

31 lines
1.3 KiB
Text

--- libmysql/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC
+++ libmysql/CMakeLists.txt
@@ -239,7 +239,7 @@ MESSAGE(STATUS "Creating LDAP authentica
ADD_SUBDIRECTORY(authentication_ldap)
# Merge several convenience libraries into one big mysqlclient
-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK})
# Visual Studio users need debug static library for debug projects
@@ -280,9 +280,10 @@ IF(NOT DISABLE_SHARED)
# and link them together into shared library.
MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
- COMPONENT SharedLibraries)
+ COMPONENT SharedLibraries SKIP_INSTALL)
TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK})
+IF(FALSE)
IF(WIN32)
# So that libmysql_api_test below can find the .dll
ADD_CUSTOM_COMMAND(TARGET libmysql POST_BUILD
@@ -338,6 +339,7 @@ ENDIF()
# to initialize api_calls[] array in api_test.c
#
SET(CLIENT_API_FUNCTION_LIST "")
+ ENDIF()
FOREACH(api ${CLIENT_API_FUNCTIONS})
SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},")
ENDFOREACH()