Test official Connector C 3.4.9 on Windows

Author: quinnj

.github/workflows/issue236-windows.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   issue236:
-    name: Windows ${{ matrix.os }} / JLL ${{ matrix.jll-version }}
+    name: Windows ${{ matrix.os }} / ${{ matrix.connector }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
     strategy:
@@ -20,9 +20,10 @@ jobs:
         os:
           - windows-2022
           - windows-2025
-        jll-version:
-          - default
-          - 3.3.9
+        connector:
+          - jll-default
+          - jll-3.3.9
+          - official-3.4.9
 
     steps:
       - uses: actions/checkout@v5
@@ -39,12 +40,40 @@ jobs:
           mysql-version: "8.4"
           root-password: root
 
+      - name: Download official Connector/C
+        if: matrix.connector == 'official-3.4.9'
+        shell: pwsh
+        run: |
+          $msi = Join-Path $env:RUNNER_TEMP "mariadb-connector-c-3.4.9-win64.msi"
+          $target = Join-Path $env:RUNNER_TEMP "mariadb-connector-c-3.4.9"
+          Invoke-WebRequest `
+            -Uri "https://dlm.mariadb.com/4751028/Connectors/c/connector-c-3.4.9/mariadb-connector-c-3.4.9-win64.msi" `
+            -OutFile $msi
+          Start-Process msiexec.exe -Wait -ArgumentList @("/a", $msi, "/qn", "TARGETDIR=$target")
+
+          $dll = Get-ChildItem $target -Recurse -Filter libmariadb.dll | Select-Object -First 1
+          if ($null -eq $dll) {
+            throw "Could not find libmariadb.dll under $target"
+          }
+
+          $plugin = Get-ChildItem $target -Recurse -Directory |
+            Where-Object { Test-Path (Join-Path $_.FullName "caching_sha2_password.dll") } |
+            Select-Object -First 1
+          if ($null -eq $plugin) {
+            throw "Could not find Connector/C plugin directory under $target"
+          }
+
+          "MYSQLJL_LIBMARIADB_OVERRIDE=$($dll.FullName)" >> $env:GITHUB_ENV
+          "MYSQLJL_PLUGIN_DIR_OVERRIDE=$($plugin.FullName)" >> $env:GITHUB_ENV
+          "$($dll.DirectoryName)" >> $env:GITHUB_PATH
+
       - name: Run issue 236 diagnostic
         shell: pwsh
         env:
           MYSQLJL_HOST: 127.0.0.1
           MYSQLJL_PORT: "3306"
           MYSQLJL_USER: root
           MYSQLJL_PASSWORD: root
-          MYSQLJL_JLL_VERSION: ${{ matrix.jll-version }}
+          MYSQLJL_CONNECTOR: ${{ matrix.connector }}
+          MYSQLJL_JLL_VERSION: ${{ matrix.connector == 'jll-3.3.9' && '3.3.9' || 'default' }}
         run: julia --startup-file=no test/issue236_windows.jl

src/api/API.jl

@@ -7,7 +7,7 @@ export DateAndTime
 using MariaDB_Connector_C_jll
 using OpenSSL_jll: libssl, libcrypto
 
-const PLUGIN_DIR = joinpath(MariaDB_Connector_C_jll.artifact_dir, "lib", "mariadb", "plugin")
+const PLUGIN_DIR = get(ENV, "MYSQLJL_PLUGIN_DIR_OVERRIDE", joinpath(MariaDB_Connector_C_jll.artifact_dir, "lib", "mariadb", "plugin"))
 
 # Pre-load OpenSSL libraries so they're available when MariaDB loads plugins.
 # MariaDB authentication plugins (e.g., caching_sha2_password) depend on OpenSSL,
@@ -37,4 +37,4 @@ include("capi.jl")
 # Prepared statement API functions
 include("papi.jl")
 
-end # module
+end # module

src/api/ccalls.jl

@@ -1,11 +1,13 @@
+const libmariadb_for_ccall = get(ENV, "MYSQLJL_LIBMARIADB_OVERRIDE", libmariadb)
+
 macro c(func, ret, args, vals...)
     if Sys.iswindows()
         esc(quote
-            ret = ccall( ($func, libmariadb), stdcall, $ret, $args, $(vals...))
+            ret = ccall( ($func, libmariadb_for_ccall), stdcall, $ret, $args, $(vals...))
         end)
     else
         esc(quote
-            ret = ccall( ($func, libmariadb),          $ret, $args, $(vals...))
+            ret = ccall( ($func, libmariadb_for_ccall),          $ret, $args, $(vals...))
         end)
     end
 end

test/issue236_windows.jl

@@ -143,8 +143,11 @@ function main()
     logline("JULIA_VERSION ", VERSION)
     logline("OS ", Sys.KERNEL, " MACHINE ", Sys.MACHINE)
     logline("WORD_SIZE ", Sys.WORD_SIZE)
-    logline("LIBMARIADB ", MariaDB_Connector_C_jll.libmariadb)
-    logline("LIBMARIADB_HANDLE ", Libdl.dlopen_e(MariaDB_Connector_C_jll.libmariadb))
+    logline("CONNECTOR ", get(ENV, "MYSQLJL_CONNECTOR", "unknown"))
+    logline("JLL_LIBMARIADB ", MariaDB_Connector_C_jll.libmariadb)
+    logline("CCALL_LIBMARIADB ", MySQL.API.libmariadb_for_ccall)
+    logline("PLUGIN_DIR ", MySQL.API.PLUGIN_DIR)
+    logline("LIBMARIADB_HANDLE ", Libdl.dlopen_e(MySQL.API.libmariadb_for_ccall))
 
     conn = prepare_database()
     try