diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d7112095..138c760e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,14 +20,14 @@ jobs:
             client: "8.4"
             server: "8.0"
           - os: ubuntu-22.04
-            client: "9.4"
+            client: "9.5"
             server: "8.4"
           - os: ubuntu-22.04
-            client: "9.4"
-            server: "9.4"
+            client: "9.5"
+            server: "9.5"
           - os: ubuntu-24.04
-            client: "9.4"
-            server: "9.4"
+            client: "9.5"
+            server: "9.5"
     runs-on: ${{ matrix.os }}
     services:
       mysql:
@@ -40,7 +40,7 @@ jobs:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: "Setup generic dependencies"
         run: |
           sudo apt update
@@ -64,15 +64,15 @@ jobs:
           sudo debconf-set-selections <<EOF
           mysql-apt-config      mysql-apt-config/select-server  select  mysql-8.4-lts
           EOF
-      - if: matrix.client == '9.4'
+      - if: matrix.client == '9.5'
         run: |
           sudo debconf-set-selections <<EOF
           mysql-apt-config      mysql-apt-config/select-server  select  mysql-innovation
           EOF
       - name: "Setup mysql libs"
         run: |
-          wget https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
-          DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.34-1_all.deb
+          wget https://dev.mysql.com/get/mysql-apt-config_0.8.36-1_all.deb
+          DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.36-1_all.deb
           sudo apt update
           sudo apt install -y libmysqlclient-dev
       - name: "Run build"
@@ -93,7 +93,7 @@ jobs:
           - 3306:3306
         options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: "Setup generic dependencies"
         run: |
           sudo apt update
@@ -110,8 +110,8 @@ jobs:
           sudo debconf-set-selections <<EOF
           mysql-apt-config      mysql-apt-config/select-server  select  mysql-8.4-lts
           EOF
-          wget https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
-          DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.34-1_all.deb
+          wget https://dev.mysql.com/get/mysql-apt-config_0.8.36-1_all.deb
+          DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.36-1_all.deb
           sudo apt update
           sudo apt install -y libmysqlclient-dev
       - name: "Run build"
@@ -124,12 +124,12 @@ jobs:
   test-tidb:
     runs-on: 'ubuntu-latest'
     services:
-      mariadb:
-        image: 'pingcap/tidb:v8.5.2'
+      tidb:
+        image: 'pingcap/tidb:v8.5.3'
         ports:
           - 4000:4000
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: "Setup generic dependencies"
         run: |
           sudo apt update
@@ -146,8 +146,8 @@ jobs:
           sudo debconf-set-selections <<EOF
           mysql-apt-config      mysql-apt-config/select-server  select  mysql-8.4-lts
           EOF
-          wget https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
-          DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.34-1_all.deb
+          wget https://dev.mysql.com/get/mysql-apt-config_0.8.36-1_all.deb
+          DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.36-1_all.deb
           sudo apt update
           sudo apt install -y libmysqlclient-dev
       - name: "Run build"
diff --git a/.github/workflows/ci_mac.yml b/.github/workflows/ci_mac.yml
index ee597c9e..f987d52c 100644
--- a/.github/workflows/ci_mac.yml
+++ b/.github/workflows/ci_mac.yml
@@ -2,10 +2,10 @@ name: CI on MacOS
 
 on: [push, pull_request, workflow_dispatch]
 jobs:
-  test:
+  macos-mysql80:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: "Install dependencies"
         run: |
           brew install cpanminus mysql@8.0 mysql-client@8.0
@@ -19,8 +19,60 @@ jobs:
           export PATH="/usr/local/opt/mysql@8.0/bin:/opt/homebrew/opt/mysql-client@8.0/bin:/opt/homebrew/opt/mysql@8.0/bin:$PATH"
           perl Makefile.PL --testhost=127.0.0.1 --testuser=root
           make
-      - name: "Start MySQL"
+      - name: "Start MySQL and run test"
         run: |
           brew services start mysql@8.0
-      - name: "Run test"
-        run: make test
+          sleep 10
+          make test
+
+  macos-mysql84:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: "Install dependencies"
+        run: |
+          brew install cpanminus mysql@8.4 mysql-client@8.4
+          cpanm DBI
+          cpanm Devel::CheckLib
+          cpanm Test::Deep
+          cpanm Test::More
+          cpanm Test::Pod
+      - name: "Run build"
+        run: |
+          export PATH="/usr/local/opt/mysql@8.4/bin:/opt/homebrew/opt/mysql-client@8.4/bin:/opt/homebrew/opt/mysql@8.4/bin:$PATH"
+          export LDFLAGS="-L$(brew --prefix openssl@3)/lib -L$(brew --prefix zstd)/lib"
+          export CFLAGS="-I$(brew --prefix openssl@3)/include -I$(brew --prefix zstd)/include" 
+          export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix zstd)/lib:$(brew --prefix openssl@3)/lib"
+          perl Makefile.PL --testhost=127.0.0.1 --testuser=root
+          make
+      - name: "Start MySQL and run test"
+        run: |
+          brew services start mysql@8.4
+          sleep 10
+          make test
+
+  macos-mysql-latest:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: "Install dependencies"
+        run: |
+          brew install cpanminus mysql mysql-client
+          cpanm DBI
+          cpanm Devel::CheckLib
+          cpanm Test::Deep
+          cpanm Test::More
+          cpanm Test::Pod
+      - name: "Run build"
+        run: |
+          export PATH="/usr/local/opt/mysql/bin:/opt/homebrew/opt/mysql-client/bin:/opt/homebrew/opt/mysql/bin:$PATH"
+          export LDFLAGS="-L$(brew --prefix openssl@3)/lib -L$(brew --prefix zstd)/lib"
+          export CFLAGS="-I$(brew --prefix openssl@3)/include -I$(brew --prefix zstd)/include" 
+          export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix zstd)/lib:$(brew --prefix openssl@3)/lib"
+          perl Makefile.PL --testhost=127.0.0.1 --testuser=root
+          make
+      - name: "Start MySQL and run test"
+        run: |
+          brew services start mysql
+          sleep 10
+          make test