Skip to content

Commit

Permalink
MySQL 8.0.29 and 5.7.37 are released (#548)
Browse files Browse the repository at this point in the history
  • Loading branch information
shogo82148 committed Apr 28, 2022
1 parent 477f35d commit 6aa4fc6
Show file tree
Hide file tree
Showing 3 changed files with 145 additions and 2 deletions.
65 changes: 65 additions & 0 deletions patches/mysql/5.7.38/skip-install-pdb.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
index d2eea7df106..3301c76068a 100644
--- a/cmake/install_macros.cmake
+++ b/cmake/install_macros.cmake
@@ -25,35 +25,8 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_parse_arguments.cmake)

# For windows: install .pdf file for each target.
MACRO (INSTALL_DEBUG_SYMBOLS targets)
- IF(MSVC)
- FOREACH(target ${targets})
- GET_TARGET_PROPERTY(type ${target} TYPE)
- IF(NOT INSTALL_LOCATION)
- IF(type MATCHES "STATIC_LIBRARY"
- OR type MATCHES "MODULE_LIBRARY"
- OR type MATCHES "SHARED_LIBRARY")
- SET(INSTALL_LOCATION "lib")
- ELSEIF(type MATCHES "EXECUTABLE")
- SET(INSTALL_LOCATION "bin")
- ELSE()
- MESSAGE(FATAL_ERROR
- "cannot determine type of ${target}. Don't now where to install")
- ENDIF()
- ENDIF()
-
- IF(target STREQUAL "mysqld")
- SET(comp Server)
- ELSE()
- SET(comp Debuginfo)
- ENDIF()
-
- # No .pdb file for static libraries.
- IF(NOT type MATCHES "STATIC_LIBRARY")
- INSTALL(FILES $<TARGET_PDB_FILE:${target}>
- DESTINATION ${INSTALL_LOCATION} COMPONENT ${comp})
- ENDIF()
- ENDFOREACH()
- ENDIF()
+# .pdb files are too large to use in GitHub Actions.
+# so skip installing
ENDMACRO()


@@ -259,22 +232,5 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
COMPONENT ${ARG_COMPONENT}
OPTIONAL)

- # For windows, install .pdb files for .exe and .dll files.
- IF(MSVC AND NOT target_type STREQUAL "STATIC_LIBRARY")
- GET_FILENAME_COMPONENT(ext ${debug_target_location} EXT)
- STRING(REPLACE "${ext}" ".pdb"
- debug_pdb_target_location "${debug_target_location}" )
- IF (RENAME_PARAM)
- STRING(REPLACE "${ext}" ".pdb" pdb_rename "${ARG_RENAME}")
- SET(PDB_RENAME_PARAM RENAME "${pdb_rename}")
- ENDIF()
-
- INSTALL(FILES ${debug_pdb_target_location}
- DESTINATION ${ARG_DESTINATION}
- ${PDB_RENAME_PARAM}
- CONFIGURATIONS Release RelWithDebInfo
- COMPONENT ${ARG_COMPONENT}
- OPTIONAL)
- ENDIF()
ENDFUNCTION()

78 changes: 78 additions & 0 deletions patches/mysql/8.0.29/skip-install-pdb.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
index 859715a45c4..3d5c8064531 100644
--- a/cmake/install_macros.cmake
+++ b/cmake/install_macros.cmake
@@ -22,33 +22,8 @@

# For windows: install .pdb file for each target.
MACRO(INSTALL_DEBUG_SYMBOLS target)
- IF(MSVC)
- GET_TARGET_PROPERTY(type ${target} TYPE)
- IF(NOT INSTALL_LOCATION)
- IF(type MATCHES "STATIC_LIBRARY"
- OR type MATCHES "MODULE_LIBRARY"
- OR type MATCHES "SHARED_LIBRARY")
- SET(INSTALL_LOCATION "lib")
- ELSEIF(type MATCHES "EXECUTABLE")
- SET(INSTALL_LOCATION "bin")
- ELSE()
- MESSAGE(FATAL_ERROR
- "cannot determine type of ${target}. Don't now where to install")
- ENDIF()
- ENDIF()
-
- IF(target STREQUAL "mysqld" OR target STREQUAL "mysqlbackup")
- SET(comp Server)
- ELSE()
- SET(comp Debuginfo)
- ENDIF()
-
- # No .pdb file for static libraries.
- IF(NOT type MATCHES "STATIC_LIBRARY")
- INSTALL(FILES $<TARGET_PDB_FILE:${target}>
- DESTINATION ${INSTALL_LOCATION} COMPONENT ${comp})
- ENDIF()
- ENDIF()
+# .pdb files are too large to use in GitHub Actions.
+# so skip installing
ENDMACRO()


@@ -274,23 +249,6 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
ENDIF()
ENDIF()

- # For windows, install .pdb files for .exe and .dll files.
- IF(MSVC AND NOT target_type STREQUAL "STATIC_LIBRARY")
- GET_FILENAME_COMPONENT(ext ${debug_target_location} EXT)
- STRING(REPLACE "${ext}" ".pdb"
- debug_pdb_target_location "${debug_target_location}" )
- IF (RENAME_PARAM)
- STRING(REPLACE "${ext}" ".pdb" pdb_rename "${ARG_RENAME}")
- SET(PDB_RENAME_PARAM RENAME "${pdb_rename}")
- ENDIF()
-
- INSTALL(FILES ${debug_pdb_target_location}
- DESTINATION ${ARG_DESTINATION}
- ${PDB_RENAME_PARAM}
- CONFIGURATIONS Release RelWithDebInfo
- COMPONENT ${ARG_COMPONENT}
- OPTIONAL)
- ENDIF()
ENDFUNCTION()


diff --git a/router/cmake/Plugin.cmake b/router/cmake/Plugin.cmake
index 30ba9fa7eaf..4b49751a124 100644
--- a/router/cmake/Plugin.cmake
+++ b/router/cmake/Plugin.cmake
@@ -150,9 +150,6 @@ FUNCTION(add_harness_plugin NAME)
INSTALL(TARGETS ${NAME}
RUNTIME DESTINATION ${_option_DESTINATION}
COMPONENT Router)
- INSTALL(FILES $<TARGET_PDB_FILE:${NAME}>
- DESTINATION ${_option_DESTINATION}
- COMPONENT Router)
ELSE()
INSTALL(TARGETS ${NAME}
LIBRARY DESTINATION ${_option_DESTINATION}
4 changes: 2 additions & 2 deletions versions/mysql.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[
"8.0.28",
"5.7.37",
"8.0.29",
"5.7.38",
"5.6.51"
]

0 comments on commit 6aa4fc6

Please sign in to comment.