MySQL 9.1 is released (#1159)

* MySQL 9.1.0, 8.4.3 and 8.0.40 are released * add MySQL 9.1.0 to test matrix
shogo82148 · Oct 21, 2024 · 7ec6831 · 7ec6831
1 parent b7415fa
commit 7ec6831
Show file tree

Hide file tree

Showing 5 changed files with 240 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -43,6 +43,7 @@ jobs:
           - windows-2022
           - windows-2019
         mysql:
+          - "9.1"
           - "9.0"
           - "8.4"
           - "8.3"

diff --git a/patches/mysql/8.0.40/skip-install-pdb.patch b/patches/mysql/8.0.40/skip-install-pdb.patch
@@ -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}
diff --git a/patches/mysql/8.4.3/skip-install-pdb.patch b/patches/mysql/8.4.3/skip-install-pdb.patch
@@ -0,0 +1,79 @@
+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()
+
+
+@@ -282,24 +257,7 @@
+       MESSAGE(STATUS "Changing RPATH when installing ${debug_target_location}")
+     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(INSTALL_DEBUG_TARGET)
+
+
+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}
diff --git a/patches/mysql/9.1.0/skip-install-pdb.patch b/patches/mysql/9.1.0/skip-install-pdb.patch
@@ -0,0 +1,79 @@
+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()
+
+
+@@ -282,24 +257,7 @@
+       MESSAGE(STATUS "Changing RPATH when installing ${debug_target_location}")
+     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(INSTALL_DEBUG_TARGET)
+
+
+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}
diff --git a/versions/mysql.json b/versions/mysql.json
@@ -1,10 +1,11 @@
 [
+    "9.1.0",
     "9.0.1",
-    "8.4.2",
+    "8.4.3",
     "8.3.0",
     "8.2.0",
     "8.1.0",
-    "8.0.39",
+    "8.0.40",
     "5.7.44",
     "5.6.51"
 ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,6 +43,7 @@ jobs: @@
               - windows-2022
               - windows-2019
             mysql:
+              - "9.1"
               - "9.0"
               - "8.4"
               - "8.3"
@@ Expand Down @@