mirror of
https://git.freebsd.org/ports.git
synced 2025-07-09 13:29:24 -04:00
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
35 lines
1.2 KiB
Text
35 lines
1.2 KiB
Text
--- CMakeLists.txt.orig 2019-01-21 18:42:44 UTC
|
|
+++ CMakeLists.txt
|
|
@@ -1011,6 +1011,7 @@ ADD_SUBDIRECTORY(extra/regex)
|
|
ADD_SUBDIRECTORY(libmysql)
|
|
ADD_SUBDIRECTORY(libbinlogevents)
|
|
ADD_SUBDIRECTORY(libbinlogstandalone)
|
|
+ADD_SUBDIRECTORY(support-files)
|
|
|
|
IF(NOT WITHOUT_SERVER)
|
|
SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
|
|
@@ -1146,12 +1147,13 @@ ENDIF()
|
|
ADD_SUBDIRECTORY(packaging/WiX)
|
|
ADD_SUBDIRECTORY(packaging/solaris)
|
|
|
|
-IF(UNIX)
|
|
- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
|
|
-ENDIF()
|
|
+#IF(UNIX)
|
|
+# INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
|
|
+#ENDIF()
|
|
#
|
|
# RPM installs documentation directly from the source tree
|
|
#
|
|
+IF(FALSE)
|
|
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
|
|
INSTALL(FILES README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
|
|
INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
|
|
@@ -1170,6 +1172,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
|
|
PATTERN "README.build" EXCLUDE
|
|
)
|
|
ENDIF()
|
|
+ENDIF()
|
|
|
|
# Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests,
|
|
# we can safely enable ASan on Clang/Win32 if needed.
|