ports/databases/mysql80-client/files/patch-utilities_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

26 lines
1.1 KiB
Text

--- utilities/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC
+++ utilities/CMakeLists.txt
@@ -59,6 +59,7 @@ FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR
ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h
${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/english/errmsg.sys
+ COMMAND mkdir -p ${PROJECT_BINARY_DIR}/share/
COMMAND comp_err
--charset=${PROJECT_SOURCE_DIR}/share/charsets
--out-dir=${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/
@@ -92,6 +93,7 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_
ADD_DEPENDENCIES(comp_err copy_openssl_dlls)
ENDIF()
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc)
TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
@@ -169,6 +171,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
ADD_DEPENDENCIES(ibd2sdi GenError)
ENDIF()
+ENDIF()
# In published release builds on Solaris, we need to bundle gcc source.
# PB2 will take care of putting it in extra/ when needed