mirror of
https://git.freebsd.org/ports.git
synced 2025-06-12 08:10:31 -04:00
b5daf80a26
PR: 265468 Bugs Fixed: - InnoDB: A TRUNCATE TABLE operation failed to remove data dictionary entries for columns that were dropped using ALGORITHM=INSTANT. - InnoDB: An incorrect nullable column calculation on tables with instantly added columns caused data to be interpreted incorrectly - InnoDB: The read_2_bytes() function in the InnoDB sources, which reads bytes from the log buffer, returned a null pointer. - Replication: The COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE column in the Performance Schema table replication_group_member_stats could persistently show transactions related to view change events (View_change_log_event) that had already been applied. These events are queued in the Group Replication applier channel but applied in the Group Replication recovery channel, causing a race condition that could result in the counter decrement being lost. The increment of the count now takes place at a more suitable point, and the counter for COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE is also now set to zero when the applier is not busy. - Debug MySQL binaries can now be built using -0g and -fno-inline. See full Changelog here: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-30.html Sponsored by: Netzkommune GmbH
52 lines
1.6 KiB
Text
52 lines
1.6 KiB
Text
--- scripts/CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
|
|
+++ scripts/CMakeLists.txt
|
|
@@ -332,6 +332,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
|
|
SET(${var} "${${var}}-L${dir} " )
|
|
ENDIF()
|
|
SET(${var} "${${var}}-l${lib} " )
|
|
+ ELSEIF(lib STREQUAL "-pthread")
|
|
+ SET(${var} "${${var}}-pthread " )
|
|
ELSE()
|
|
SET(${var} "${${var}}-l${lib} " )
|
|
ENDIF()
|
|
@@ -405,7 +407,7 @@ ELSE()
|
|
${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
|
|
ESCAPE_QUOTES @ONLY)
|
|
|
|
- IF(INSTALL_PKGCONFIGDIR)
|
|
+ IF(INSTALL_PKGCONFIGDIR AND NOT WITHOUT_CLIENTLIBS)
|
|
MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
|
|
INSTALL(FILES
|
|
${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
|
|
@@ -418,23 +420,28 @@ ELSE()
|
|
# mysqld_safe used in mtr even for systemd platforms
|
|
IF(WITH_SYSTEMD)
|
|
SET(BIN_SCRIPTS
|
|
- mysql_config
|
|
mysqldumpslow
|
|
mysqld_safe
|
|
)
|
|
ELSE()
|
|
SET(BIN_SCRIPTS
|
|
- mysql_config
|
|
mysqldumpslow
|
|
mysqld_multi
|
|
mysqld_safe
|
|
)
|
|
ENDIF()
|
|
|
|
+ IF(NOT WITHOUT_CLIENTLIBS)
|
|
+ SET(BIN_SCRIPTS
|
|
+ ${BIN_SCRIPTS}
|
|
+ mysql_config
|
|
+ )
|
|
+ ENDIF(NOT WITHOUT_CLIENTLIBS)
|
|
+
|
|
FOREACH(file ${BIN_SCRIPTS})
|
|
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
|
|
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
|
|
- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY
|
|
+ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY
|
|
)
|
|
ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.pl.in)
|
|
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.pl.in
|