From 0bf0f7d0dde9e637c58370abf4a1499447cc1dfc Mon Sep 17 00:00:00 2001
From: ICHINOSE Shogo <shogo82148@gmail.com>
Date: Thu, 4 Jul 2024 01:31:34 +0900
Subject: [PATCH 1/6] MySQL 8.4.1 is released

---
 versions/mysql.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/mysql.json b/versions/mysql.json
index 6cde39a0..59cde31d 100644
--- a/versions/mysql.json
+++ b/versions/mysql.json
@@ -1,5 +1,5 @@
 [
-    "8.4.0",
+    "8.4.1",
     "8.3.0",
     "8.2.0",
     "8.1.0",

From e7144e7e96ff6930386f2ecceb5e85da946e5790 Mon Sep 17 00:00:00 2001
From: ICHINOSE Shogo <shogo82148@gmail.com>
Date: Sat, 6 Jul 2024 18:43:40 +0900
Subject: [PATCH 2/6] fix mysql.json

---
 versions/mysql.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/mysql.json b/versions/mysql.json
index ec18f2bc..6e3b0ac1 100644
--- a/versions/mysql.json
+++ b/versions/mysql.json
@@ -1,6 +1,6 @@
 [
-    "8.4.1",
     "9.0.0",
+    "8.4.1",
     "8.3.0",
     "8.2.0",
     "8.1.0",

From 75d49823a0195574b68820ee04dbd31c1e230612 Mon Sep 17 00:00:00 2001
From: ICHINOSE Shogo <shogo82148@gmail.com>
Date: Sat, 6 Jul 2024 19:34:14 +0900
Subject: [PATCH 3/6] chore: Update build-mysql-darwin.sh to support MySQL 8.0
 or later

---
 .github/build-mysql-darwin.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/build-mysql-darwin.sh b/.github/build-mysql-darwin.sh
index 0b6fac0b..b8288db7 100755
--- a/.github/build-mysql-darwin.sh
+++ b/.github/build-mysql-darwin.sh
@@ -24,14 +24,16 @@ esac
 PREFIX=$RUNNER_TOOL_CACHE/mysql/$MYSQL_VERSION/$MYSQL_ARCH
 export LDFLAGS=-Wl,-rpath,$PREFIX/lib
 
-# install LLVM
-brew install llvm@17
-LLVM_PATH=$(brew --prefix llvm@17)
-export PATH="$LLVM_PATH/bin:$PATH"
-export LDFLAGS="$LDFLAGS -L$LLVM_PATH/lib"
-export CPPFLAGS="$CPPFLAGS -I$LLVM_PATH/include"
-export CC=$LLVM_PATH/bin/clang
-export CXX=$LLVM_PATH/bin/clang++
+if [[ "$MYSQL_VERSION" =~ ^[89][.] ]]; then # MySQL 8.0 or later
+    # install LLVM
+    brew install llvm@17
+    LLVM_PATH=$(brew --prefix llvm@17)
+    export PATH="$LLVM_PATH/bin:$PATH"
+    export LDFLAGS="$LDFLAGS -L$LLVM_PATH/lib"
+    export CPPFLAGS="$CPPFLAGS -I$LLVM_PATH/include"
+    export CC=$LLVM_PATH/bin/clang
+    export CXX=$LLVM_PATH/bin/clang++
+fi
 
 # detect the number of CPU Core
 JOBS=$(sysctl -n hw.logicalcpu_max)

From 6f50403314f89f06b3e05aad04cff012011fe73c Mon Sep 17 00:00:00 2001
From: ICHINOSE Shogo <shogo82148@gmail.com>
Date: Sat, 6 Jul 2024 20:28:20 +0900
Subject: [PATCH 4/6] chore: Update build-mysql-darwin.sh to support MySQL 8.4
 or later

---
 .github/build-mysql-darwin-macos14.sh | 2 +-
 .github/build-mysql-darwin.sh         | 4 ++--
 .github/build-mysql-linux.sh          | 2 +-
 .github/build-mysql-windows.ps1       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/build-mysql-darwin-macos14.sh b/.github/build-mysql-darwin-macos14.sh
index 1d0afe74..826dfd21 100755
--- a/.github/build-mysql-darwin-macos14.sh
+++ b/.github/build-mysql-darwin-macos14.sh
@@ -34,7 +34,7 @@ ACTION_VERSION=$(jq -r '.version' < "$ROOT/../package.json")
 
 # system SSL/TLS library is too old. so we use custom build.
 
-if [[ "$MYSQL_VERSION" =~ ^[89][.] ]]; then # MySQL 8.0 or later
+if [[ "$MYSQL_VERSION" =~ ^([1-9][0-9][.]|[89][.]) ]]; then # MySQL 8.0 or later
     # build OpenSSL v3
     export OPENSSL_VERSION=$OPENSSL_VERSION3
     echo "::group::download OpenSSL source"
diff --git a/.github/build-mysql-darwin.sh b/.github/build-mysql-darwin.sh
index b8288db7..e5808aeb 100755
--- a/.github/build-mysql-darwin.sh
+++ b/.github/build-mysql-darwin.sh
@@ -24,7 +24,7 @@ esac
 PREFIX=$RUNNER_TOOL_CACHE/mysql/$MYSQL_VERSION/$MYSQL_ARCH
 export LDFLAGS=-Wl,-rpath,$PREFIX/lib
 
-if [[ "$MYSQL_VERSION" =~ ^[89][.] ]]; then # MySQL 8.0 or later
+if [[ "$MYSQL_VERSION" =~ ^([1-9][0-9][.]|9[.]|8[.]4[.]) ]]; then # MySQL 8.4 or later
     # install LLVM
     brew install llvm@17
     LLVM_PATH=$(brew --prefix llvm@17)
@@ -45,7 +45,7 @@ ACTION_VERSION=$(jq -r '.version' < "$ROOT/../package.json")
 
 # system SSL/TLS library is too old. so we use custom build.
 
-if [[ "$MYSQL_VERSION" =~ ^[89][.] ]]; then # MySQL 8.0 or later
+if [[ "$MYSQL_VERSION" =~ ^([1-9][0-9][.]|[89][.]) ]]; then # MySQL 8.0 or later
     # build OpenSSL v3
     export OPENSSL_VERSION=$OPENSSL_VERSION3
     echo "::group::download OpenSSL source"
diff --git a/.github/build-mysql-linux.sh b/.github/build-mysql-linux.sh
index b1d3428c..3fc08dab 100755
--- a/.github/build-mysql-linux.sh
+++ b/.github/build-mysql-linux.sh
@@ -89,7 +89,7 @@ ACTION_VERSION=$(jq -r '.version' < "$ROOT/../package.json")
 
 # system SSL/TLS library is too old. so we use custom build.
 
-if [[ "$MYSQL_VERSION" =~ ^[89][.] ]]; then # MySQL 8.0 or later
+if [[ "$MYSQL_VERSION" =~ ^([1-9][0-9][.]|[89][.]) ]]; then # MySQL 8.0 or later
     # build OpenSSL v3
     export OPENSSL_VERSION=$OPENSSL_VERSION3
     echo "::group::download OpenSSL source"
diff --git a/.github/build-mysql-windows.ps1 b/.github/build-mysql-windows.ps1
index 23da8f31..ded58a91 100755
--- a/.github/build-mysql-windows.ps1
+++ b/.github/build-mysql-windows.ps1
@@ -58,7 +58,7 @@ Write-Host "::endgroup::"
 
 
 # system SSL/TLS library is too old. so we use custom build.
-if ( $MYSQL_VERSION -match '^8[.]') # MySQL 8.0 or later
+if ( $MYSQL_VERSION -match '^([1-9][0-9][.]|[89][.])') # MySQL 8.0 or later
 {
     $OPENSSL_VERSION = $OPENSSL_VERSION3
     Write-Host "::group::fetch OpenSSL source"
@@ -113,7 +113,7 @@ if ( $MYSQL_VERSION -match '^8[.]') # MySQL 8.0 or later
 
 # Bison
 Write-Host "::group::Set up Bison"
-if ( $MYSQL_VERSION -match '^[89][.]' ) # MySQL 8.0 or later
+if ( $MYSQL_VERSION -match '^^([1-9][0-9][.]|[89][.])' ) # MySQL 8.0 or later
 {
     choco install winflexbison3
 }

From f5332848db6ffb538443cc65493e1684cd4b96e9 Mon Sep 17 00:00:00 2001
From: ICHINOSE Shogo <shogo82148@gmail.com>
Date: Sat, 6 Jul 2024 20:38:36 +0900
Subject: [PATCH 5/6] chore: Skip installing .pdb files for MySQL 8.4.1 or
 later

---
 patches/mysql/8.4.1/skip-install-pdb.patch | 79 ++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 patches/mysql/8.4.1/skip-install-pdb.patch

diff --git a/patches/mysql/8.4.1/skip-install-pdb.patch b/patches/mysql/8.4.1/skip-install-pdb.patch
new file mode 100644
index 00000000..00798301
--- /dev/null
+++ b/patches/mysql/8.4.1/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}

From c03cebfed015f694fb53205fb7363e56a1dccb4b Mon Sep 17 00:00:00 2001
From: ICHINOSE Shogo <shogo82148@gmail.com>
Date: Sat, 6 Jul 2024 20:39:01 +0900
Subject: [PATCH 6/6] fix typo

---
 .github/build-mysql-windows.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/build-mysql-windows.ps1 b/.github/build-mysql-windows.ps1
index ded58a91..99adaff6 100755
--- a/.github/build-mysql-windows.ps1
+++ b/.github/build-mysql-windows.ps1
@@ -113,7 +113,7 @@ if ( $MYSQL_VERSION -match '^([1-9][0-9][.]|[89][.])') # MySQL 8.0 or later
 
 # Bison
 Write-Host "::group::Set up Bison"
-if ( $MYSQL_VERSION -match '^^([1-9][0-9][.]|[89][.])' ) # MySQL 8.0 or later
+if ( $MYSQL_VERSION -match '^([1-9][0-9][.]|[89][.])' ) # MySQL 8.0 or later
 {
     choco install winflexbison3
 }