diff --git a/ports/libmysql/fix_dup_symbols.patch b/ports/libmysql/fix_dup_symbols.patch
index 352fd8af89..a3bda5b0a9 100644
--- a/ports/libmysql/fix_dup_symbols.patch
+++ b/ports/libmysql/fix_dup_symbols.patch
@@ -1,8 +1,8 @@
 diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index 058967b..bcd8841 100644
+index d54f4a6f..cd2132c9 100644
 --- a/client/CMakeLists.txt
 +++ b/client/CMakeLists.txt
-@@ -43,7 +43,6 @@ MYSQL_ADD_EXECUTABLE(mysql
+@@ -44,7 +44,6 @@ MYSQL_ADD_EXECUTABLE(mysql
    pattern_matcher.cc
    readline.cc
    client_query_attributes.cc
@@ -10,11 +10,11 @@ index 058967b..bcd8841 100644
    ${CMAKE_CURRENT_SOURCE_DIR}/common/user_registration.cc
    LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY}
    )
-@@ -226,7 +226,6 @@ SET(MYSQLBINLOG_SOURCES
+@@ -232,7 +231,6 @@ SET(MYSQLBINLOG_SOURCES
    ${CMAKE_SOURCE_DIR}/sql/binlog_reader.cc
    ${CMAKE_SOURCE_DIR}/sql/stream_cipher.cc
    ${CMAKE_SOURCE_DIR}/sql/rpl_log_encryption.cc
 -  ${CMAKE_SOURCE_DIR}/libbinlogevents/src/trx_boundary_parser.cpp
    )
  
- SET(MYSQLBINLOG_LIBRARIES
+ # The client version of log_event.cc has false positives.
diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake
index 4e67625bd5..f25c1e0066 100644
--- a/ports/libmysql/portfile.cmake
+++ b/ports/libmysql/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mysql/mysql-server
-    REF mysql-${VERSION}
-    SHA512 80341fe6bf6738b30721933a31c8c3f033ce8342a3a2defeb83e29219375bff274620f6f21a02ee6f4e77f0d3a858a20487436a5afd0a95ea35b0523812c52ab
+    REF "mysql-${VERSION}"
+    SHA512 f0591d263de557877a618b04871d332dc227e26c7e9b61994093dc9af29971ea6332761de5391bb8da955bd58b3b98da90722bafdbf86f36764995a70f94ae62
     HEAD_REF master
     PATCHES
         dependencies.patch
diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json
index 702cdb34f2..cafaecce88 100644
--- a/ports/libmysql/vcpkg.json
+++ b/ports/libmysql/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libmysql",
-  "version": "8.0.39",
+  "version": "8.0.40",
   "description": "A MySQL client library for C development",
   "homepage": "https://github.com/mysql/mysql-server",
   "license": "GPL-2.0-or-later",
diff --git a/versions/baseline.json b/versions/baseline.json
index 5738f66702..1d1067aefb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4829,7 +4829,7 @@
       "port-version": 0
     },
     "libmysql": {
-      "baseline": "8.0.39",
+      "baseline": "8.0.40",
       "port-version": 0
     },
     "libnice": {
diff --git a/versions/l-/libmysql.json b/versions/l-/libmysql.json
index db40a330e8..f1390ff106 100644
--- a/versions/l-/libmysql.json
+++ b/versions/l-/libmysql.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1fcb166c50b683fcbda07bec1e7bfb7c37234525",
+      "version": "8.0.40",
+      "port-version": 0
+    },
     {
       "git-tree": "eb4f616fe98bc02a278669124285ef829bf8abb4",
       "version": "8.0.39",