Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
200 changes: 200 additions & 0 deletions .github/workflows/issue236-windows.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
name: Issue 236 Windows diagnostics

on:
pull_request:
paths:
- ".github/workflows/issue236-windows.yml"
- "test/issue236_windows.jl"
- "src/**"
- "Project.toml"
workflow_dispatch:

jobs:
build-yggdrasil-variant:
name: Build Yggdrasil variant / ${{ matrix.variant }}
if: github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
include:
- variant: fno-strict-aliasing
cflags: -fno-strict-aliasing
- variant: fno-tree-vectorize
cflags: -fno-tree-vectorize
steps:
- uses: julia-actions/setup-julia@v2
with:
version: "1.12"

- uses: actions/checkout@v5
with:
repository: JuliaPackaging/Yggdrasil
path: Yggdrasil

- name: Patch MariaDB Connector/C recipe
shell: bash
run: |
set -euo pipefail
cd Yggdrasil/M/MariaDB_Connector_C
perl -0pi -e 's/\Q-Wno-error -Wno-incompatible-pointer-types\E/-Wno-error -Wno-incompatible-pointer-types $ENV{EXTRA_CFLAGS}/' build_tarballs.jl
grep -n -- "$EXTRA_CFLAGS" build_tarballs.jl
env:
EXTRA_CFLAGS: ${{ matrix.cflags }}

- name: Build Windows tarball
shell: bash
run: |
set -euo pipefail
cd Yggdrasil/M/MariaDB_Connector_C
julia --project=../.. --startup-file=no -e 'using Pkg; Pkg.instantiate()'
julia --project=../.. --startup-file=no build_tarballs.jl --verbose x86_64-w64-mingw32
mkdir -p "$GITHUB_WORKSPACE/variant"
cp products/MariaDB_Connector_C.v*.x86_64-w64-mingw32.tar.gz "$GITHUB_WORKSPACE/variant/"
cp products/MariaDB_Connector_C-logs.v*.x86_64-w64-mingw32.tar.gz "$GITHUB_WORKSPACE/variant/"

- uses: actions/upload-artifact@v5
with:
name: mariadb-connector-c-${{ matrix.variant }}
path: variant/*.tar.gz

issue236:
name: Windows ${{ matrix.os }} / ${{ matrix.connector }}
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os:
- windows-2022
- windows-2025
connector:
- jll-default
- jll-3.3.9
- official-3.4.9

steps:
- uses: actions/checkout@v5

- uses: julia-actions/setup-julia@v2
with:
version: "1"
arch: x64

- name: Start MySQL
id: setup-mysql
uses: shogo82148/actions-setup-mysql@v1.51.0
with:
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_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

issue236-yggdrasil-variant:
name: Windows ${{ matrix.os }} / yggdrasil-${{ matrix.variant }}
if: github.event_name == 'workflow_dispatch'
needs: build-yggdrasil-variant
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os:
- windows-2022
- windows-2025
variant:
- fno-strict-aliasing
- fno-tree-vectorize

steps:
- uses: actions/checkout@v5

- uses: julia-actions/setup-julia@v2
with:
version: "1"
arch: x64

- name: Start MySQL
uses: shogo82148/actions-setup-mysql@v1.51.0
with:
mysql-version: "8.4"
root-password: root

- uses: actions/download-artifact@v5
with:
name: mariadb-connector-c-${{ matrix.variant }}
path: ${{ runner.temp }}/variant

- name: Use Yggdrasil variant
shell: pwsh
run: |
$target = Join-Path $env:RUNNER_TEMP "mariadb-connector-c-${env:MYSQLJL_CONNECTOR_VARIANT}"
New-Item -ItemType Directory -Force -Path $target | Out-Null
$tarball = Get-ChildItem (Join-Path $env:RUNNER_TEMP "variant") -Filter "MariaDB_Connector_C.v*.x86_64-w64-mingw32.tar.gz" | Select-Object -First 1
if ($null -eq $tarball) {
throw "Could not find built Connector/C tarball"
}
tar -xzf $tarball.FullName -C $target

$dll = Join-Path $target "bin/libmariadb.dll"
$plugin = Join-Path $target "lib/mariadb/plugin"
if (!(Test-Path $dll)) {
throw "Could not find libmariadb.dll at $dll"
}
if (!(Test-Path (Join-Path $plugin "caching_sha2_password.dll"))) {
throw "Could not find Connector/C plugin directory at $plugin"
}

"MYSQLJL_LIBMARIADB_OVERRIDE=$dll" >> $env:GITHUB_ENV
"MYSQLJL_PLUGIN_DIR_OVERRIDE=$plugin" >> $env:GITHUB_ENV
"$(Split-Path -Parent $dll)" >> $env:GITHUB_PATH
env:
MYSQLJL_CONNECTOR_VARIANT: ${{ matrix.variant }}

- name: Run issue 236 diagnostic
shell: pwsh
env:
MYSQLJL_HOST: 127.0.0.1
MYSQLJL_PORT: "3306"
MYSQLJL_USER: root
MYSQLJL_PASSWORD: root
MYSQLJL_CONNECTOR: yggdrasil-${{ matrix.variant }}
MYSQLJL_JLL_VERSION: default
run: julia --startup-file=no test/issue236_windows.jl
4 changes: 2 additions & 2 deletions src/api/API.jl
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -37,4 +37,4 @@ include("capi.jl")
# Prepared statement API functions
include("papi.jl")

end # module
end # module
6 changes: 4 additions & 2 deletions src/api/ccalls.jl
Original file line numberDiff line numberDiff line change
@@ -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
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
200 changes: 200 additions & 0 deletions .github/workflows/issue236-windows.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
name: Issue 236 Windows diagnostics

on:
pull_request:
paths:
- ".github/workflows/issue236-windows.yml"
- "test/issue236_windows.jl"
- "src/**"
- "Project.toml"
workflow_dispatch:

jobs:
build-yggdrasil-variant:
name: Build Yggdrasil variant / ${{ matrix.variant }}
if: github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
include:
- variant: fno-strict-aliasing
cflags: -fno-strict-aliasing
- variant: fno-tree-vectorize
cflags: -fno-tree-vectorize
steps:
- uses: julia-actions/setup-julia@v2
with:
version: "1.12"

- uses: actions/checkout@v5
with:
repository: JuliaPackaging/Yggdrasil
path: Yggdrasil

- name: Patch MariaDB Connector/C recipe
shell: bash
run: |
set -euo pipefail
cd Yggdrasil/M/MariaDB_Connector_C
perl -0pi -e 's/\Q-Wno-error -Wno-incompatible-pointer-types\E/-Wno-error -Wno-incompatible-pointer-types $ENV{EXTRA_CFLAGS}/' build_tarballs.jl
grep -n -- "$EXTRA_CFLAGS" build_tarballs.jl
env:
EXTRA_CFLAGS: ${{ matrix.cflags }}

- name: Build Windows tarball
shell: bash
run: |
set -euo pipefail
cd Yggdrasil/M/MariaDB_Connector_C
julia --project=../.. --startup-file=no -e 'using Pkg; Pkg.instantiate()'
julia --project=../.. --startup-file=no build_tarballs.jl --verbose x86_64-w64-mingw32
mkdir -p "$GITHUB_WORKSPACE/variant"
cp products/MariaDB_Connector_C.v*.x86_64-w64-mingw32.tar.gz "$GITHUB_WORKSPACE/variant/"
cp products/MariaDB_Connector_C-logs.v*.x86_64-w64-mingw32.tar.gz "$GITHUB_WORKSPACE/variant/"

- uses: actions/upload-artifact@v5
with:
name: mariadb-connector-c-${{ matrix.variant }}
path: variant/*.tar.gz

issue236:
name: Windows ${{ matrix.os }} / ${{ matrix.connector }}
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os:
- windows-2022
- windows-2025
connector:
- jll-default
- jll-3.3.9
- official-3.4.9

steps:
- uses: actions/checkout@v5

- uses: julia-actions/setup-julia@v2
with:
version: "1"
arch: x64

- name: Start MySQL
id: setup-mysql
uses: shogo82148/actions-setup-mysql@v1.51.0
with:
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_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

issue236-yggdrasil-variant:
name: Windows ${{ matrix.os }} / yggdrasil-${{ matrix.variant }}
if: github.event_name == 'workflow_dispatch'
needs: build-yggdrasil-variant
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os:
- windows-2022
- windows-2025
variant:
- fno-strict-aliasing
- fno-tree-vectorize

steps:
- uses: actions/checkout@v5

- uses: julia-actions/setup-julia@v2
with:
version: "1"
arch: x64

- name: Start MySQL
uses: shogo82148/actions-setup-mysql@v1.51.0
with:
mysql-version: "8.4"
root-password: root

- uses: actions/download-artifact@v5
with:
name: mariadb-connector-c-${{ matrix.variant }}
path: ${{ runner.temp }}/variant

- name: Use Yggdrasil variant
shell: pwsh
run: |
$target = Join-Path $env:RUNNER_TEMP "mariadb-connector-c-${env:MYSQLJL_CONNECTOR_VARIANT}"
New-Item -ItemType Directory -Force -Path $target | Out-Null
$tarball = Get-ChildItem (Join-Path $env:RUNNER_TEMP "variant") -Filter "MariaDB_Connector_C.v*.x86_64-w64-mingw32.tar.gz" | Select-Object -First 1
if ($null -eq $tarball) {
throw "Could not find built Connector/C tarball"
}
tar -xzf $tarball.FullName -C $target

$dll = Join-Path $target "bin/libmariadb.dll"
$plugin = Join-Path $target "lib/mariadb/plugin"
if (!(Test-Path $dll)) {
throw "Could not find libmariadb.dll at $dll"
}
if (!(Test-Path (Join-Path $plugin "caching_sha2_password.dll"))) {
throw "Could not find Connector/C plugin directory at $plugin"
}

"MYSQLJL_LIBMARIADB_OVERRIDE=$dll" >> $env:GITHUB_ENV
"MYSQLJL_PLUGIN_DIR_OVERRIDE=$plugin" >> $env:GITHUB_ENV
"$(Split-Path -Parent $dll)" >> $env:GITHUB_PATH
env:
MYSQLJL_CONNECTOR_VARIANT: ${{ matrix.variant }}

- name: Run issue 236 diagnostic
shell: pwsh
env:
MYSQLJL_HOST: 127.0.0.1
MYSQLJL_PORT: "3306"
MYSQLJL_USER: root
MYSQLJL_PASSWORD: root
MYSQLJL_CONNECTOR: yggdrasil-${{ matrix.variant }}
MYSQLJL_JLL_VERSION: default
run: julia --startup-file=no test/issue236_windows.jl
4 changes: 2 additions & 2 deletions src/api/API.jl
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -37,4 +37,4 @@ include("capi.jl")
# Prepared statement API functions
include("papi.jl")

end # module
end # module
6 changes: 4 additions & 2 deletions src/api/ccalls.jl
Original file line numberDiff line numberDiff line change
@@ -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
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
200 changes: 200 additions & 0 deletions .github/workflows/issue236-windows.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
name: Issue 236 Windows diagnostics

on:
pull_request:
paths:
- ".github/workflows/issue236-windows.yml"
- "test/issue236_windows.jl"
- "src/**"
- "Project.toml"
workflow_dispatch:

jobs:
build-yggdrasil-variant:
name: Build Yggdrasil variant / ${{ matrix.variant }}
if: github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
include:
- variant: fno-strict-aliasing
cflags: -fno-strict-aliasing
- variant: fno-tree-vectorize
cflags: -fno-tree-vectorize
steps:
- uses: julia-actions/setup-julia@v2
with:
version: "1.12"

- uses: actions/checkout@v5
with:
repository: JuliaPackaging/Yggdrasil
path: Yggdrasil

- name: Patch MariaDB Connector/C recipe
shell: bash
run: |
set -euo pipefail
cd Yggdrasil/M/MariaDB_Connector_C
perl -0pi -e 's/\Q-Wno-error -Wno-incompatible-pointer-types\E/-Wno-error -Wno-incompatible-pointer-types $ENV{EXTRA_CFLAGS}/' build_tarballs.jl
grep -n -- "$EXTRA_CFLAGS" build_tarballs.jl
env:
EXTRA_CFLAGS: ${{ matrix.cflags }}

- name: Build Windows tarball
shell: bash
run: |
set -euo pipefail
cd Yggdrasil/M/MariaDB_Connector_C
julia --project=../.. --startup-file=no -e 'using Pkg; Pkg.instantiate()'
julia --project=../.. --startup-file=no build_tarballs.jl --verbose x86_64-w64-mingw32
mkdir -p "$GITHUB_WORKSPACE/variant"
cp products/MariaDB_Connector_C.v*.x86_64-w64-mingw32.tar.gz "$GITHUB_WORKSPACE/variant/"
cp products/MariaDB_Connector_C-logs.v*.x86_64-w64-mingw32.tar.gz "$GITHUB_WORKSPACE/variant/"

- uses: actions/upload-artifact@v5
with:
name: mariadb-connector-c-${{ matrix.variant }}
path: variant/*.tar.gz

issue236:
name: Windows ${{ matrix.os }} / ${{ matrix.connector }}
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os:
- windows-2022
- windows-2025
connector:
- jll-default
- jll-3.3.9
- official-3.4.9

steps:
- uses: actions/checkout@v5

- uses: julia-actions/setup-julia@v2
with:
version: "1"
arch: x64

- name: Start MySQL
id: setup-mysql
uses: shogo82148/actions-setup-mysql@v1.51.0
with:
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_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

issue236-yggdrasil-variant:
name: Windows ${{ matrix.os }} / yggdrasil-${{ matrix.variant }}
if: github.event_name == 'workflow_dispatch'
needs: build-yggdrasil-variant
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os:
- windows-2022
- windows-2025
variant:
- fno-strict-aliasing
- fno-tree-vectorize

steps:
- uses: actions/checkout@v5

- uses: julia-actions/setup-julia@v2
with:
version: "1"
arch: x64

- name: Start MySQL
uses: shogo82148/actions-setup-mysql@v1.51.0
with:
mysql-version: "8.4"
root-password: root

- uses: actions/download-artifact@v5
with:
name: mariadb-connector-c-${{ matrix.variant }}
path: ${{ runner.temp }}/variant

- name: Use Yggdrasil variant
shell: pwsh
run: |
$target = Join-Path $env:RUNNER_TEMP "mariadb-connector-c-${env:MYSQLJL_CONNECTOR_VARIANT}"
New-Item -ItemType Directory -Force -Path $target | Out-Null
$tarball = Get-ChildItem (Join-Path $env:RUNNER_TEMP "variant") -Filter "MariaDB_Connector_C.v*.x86_64-w64-mingw32.tar.gz" | Select-Object -First 1
if ($null -eq $tarball) {
throw "Could not find built Connector/C tarball"
}
tar -xzf $tarball.FullName -C $target

$dll = Join-Path $target "bin/libmariadb.dll"
$plugin = Join-Path $target "lib/mariadb/plugin"
if (!(Test-Path $dll)) {
throw "Could not find libmariadb.dll at $dll"
}
if (!(Test-Path (Join-Path $plugin "caching_sha2_password.dll"))) {
throw "Could not find Connector/C plugin directory at $plugin"
}

"MYSQLJL_LIBMARIADB_OVERRIDE=$dll" >> $env:GITHUB_ENV
"MYSQLJL_PLUGIN_DIR_OVERRIDE=$plugin" >> $env:GITHUB_ENV
"$(Split-Path -Parent $dll)" >> $env:GITHUB_PATH
env:
MYSQLJL_CONNECTOR_VARIANT: ${{ matrix.variant }}

- name: Run issue 236 diagnostic
shell: pwsh
env:
MYSQLJL_HOST: 127.0.0.1
MYSQLJL_PORT: "3306"
MYSQLJL_USER: root
MYSQLJL_PASSWORD: root
MYSQLJL_CONNECTOR: yggdrasil-${{ matrix.variant }}
MYSQLJL_JLL_VERSION: default
run: julia --startup-file=no test/issue236_windows.jl
4 changes: 2 additions & 2 deletions src/api/API.jl
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -37,4 +37,4 @@ include("capi.jl")
# Prepared statement API functions
include("papi.jl")

end # module
end # module
6 changes: 4 additions & 2 deletions src/api/ccalls.jl
Original file line numberDiff line numberDiff line change
@@ -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
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
200 changes: 200 additions & 0 deletions .github/workflows/issue236-windows.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
name: Issue 236 Windows diagnostics

on:
pull_request:
paths:
- ".github/workflows/issue236-windows.yml"
- "test/issue236_windows.jl"
- "src/**"
- "Project.toml"
workflow_dispatch:

jobs:
build-yggdrasil-variant:
name: Build Yggdrasil variant / ${{ matrix.variant }}
if: github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
include:
- variant: fno-strict-aliasing
cflags: -fno-strict-aliasing
- variant: fno-tree-vectorize
cflags: -fno-tree-vectorize
steps:
- uses: julia-actions/setup-julia@v2
with:
version: "1.12"

- uses: actions/checkout@v5
with:
repository: JuliaPackaging/Yggdrasil
path: Yggdrasil

- name: Patch MariaDB Connector/C recipe
shell: bash
run: |
set -euo pipefail
cd Yggdrasil/M/MariaDB_Connector_C
perl -0pi -e 's/\Q-Wno-error -Wno-incompatible-pointer-types\E/-Wno-error -Wno-incompatible-pointer-types $ENV{EXTRA_CFLAGS}/' build_tarballs.jl
grep -n -- "$EXTRA_CFLAGS" build_tarballs.jl
env:
EXTRA_CFLAGS: ${{ matrix.cflags }}

- name: Build Windows tarball
shell: bash
run: |
set -euo pipefail
cd Yggdrasil/M/MariaDB_Connector_C
julia --project=../.. --startup-file=no -e 'using Pkg; Pkg.instantiate()'
julia --project=../.. --startup-file=no build_tarballs.jl --verbose x86_64-w64-mingw32
mkdir -p "$GITHUB_WORKSPACE/variant"
cp products/MariaDB_Connector_C.v*.x86_64-w64-mingw32.tar.gz "$GITHUB_WORKSPACE/variant/"
cp products/MariaDB_Connector_C-logs.v*.x86_64-w64-mingw32.tar.gz "$GITHUB_WORKSPACE/variant/"

- uses: actions/upload-artifact@v5
with:
name: mariadb-connector-c-${{ matrix.variant }}
path: variant/*.tar.gz

issue236:
name: Windows ${{ matrix.os }} / ${{ matrix.connector }}
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os:
- windows-2022
- windows-2025
connector:
- jll-default
- jll-3.3.9
- official-3.4.9

steps:
- uses: actions/checkout@v5

- uses: julia-actions/setup-julia@v2
with:
version: "1"
arch: x64

- name: Start MySQL
id: setup-mysql
uses: shogo82148/actions-setup-mysql@v1.51.0
with:
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_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

issue236-yggdrasil-variant:
name: Windows ${{ matrix.os }} / yggdrasil-${{ matrix.variant }}
if: github.event_name == 'workflow_dispatch'
needs: build-yggdrasil-variant
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os:
- windows-2022
- windows-2025
variant:
- fno-strict-aliasing
- fno-tree-vectorize

steps:
- uses: actions/checkout@v5

- uses: julia-actions/setup-julia@v2
with:
version: "1"
arch: x64

- name: Start MySQL
uses: shogo82148/actions-setup-mysql@v1.51.0
with:
mysql-version: "8.4"
root-password: root

- uses: actions/download-artifact@v5
with:
name: mariadb-connector-c-${{ matrix.variant }}
path: ${{ runner.temp }}/variant

- name: Use Yggdrasil variant
shell: pwsh
run: |
$target = Join-Path $env:RUNNER_TEMP "mariadb-connector-c-${env:MYSQLJL_CONNECTOR_VARIANT}"
New-Item -ItemType Directory -Force -Path $target | Out-Null
$tarball = Get-ChildItem (Join-Path $env:RUNNER_TEMP "variant") -Filter "MariaDB_Connector_C.v*.x86_64-w64-mingw32.tar.gz" | Select-Object -First 1
if ($null -eq $tarball) {
throw "Could not find built Connector/C tarball"
}
tar -xzf $tarball.FullName -C $target

$dll = Join-Path $target "bin/libmariadb.dll"
$plugin = Join-Path $target "lib/mariadb/plugin"
if (!(Test-Path $dll)) {
throw "Could not find libmariadb.dll at $dll"
}
if (!(Test-Path (Join-Path $plugin "caching_sha2_password.dll"))) {
throw "Could not find Connector/C plugin directory at $plugin"
}

"MYSQLJL_LIBMARIADB_OVERRIDE=$dll" >> $env:GITHUB_ENV
"MYSQLJL_PLUGIN_DIR_OVERRIDE=$plugin" >> $env:GITHUB_ENV
"$(Split-Path -Parent $dll)" >> $env:GITHUB_PATH
env:
MYSQLJL_CONNECTOR_VARIANT: ${{ matrix.variant }}

- name: Run issue 236 diagnostic
shell: pwsh
env:
MYSQLJL_HOST: 127.0.0.1
MYSQLJL_PORT: "3306"
MYSQLJL_USER: root
MYSQLJL_PASSWORD: root
MYSQLJL_CONNECTOR: yggdrasil-${{ matrix.variant }}
MYSQLJL_JLL_VERSION: default
run: julia --startup-file=no test/issue236_windows.jl
4 changes: 2 additions & 2 deletions src/api/API.jl
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -37,4 +37,4 @@ include("capi.jl")
# Prepared statement API functions
include("papi.jl")

end # module
end # module
6 changes: 4 additions & 2 deletions src/api/ccalls.jl
Original file line numberDiff line numberDiff line change
@@ -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
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
200 changes: 200 additions & 0 deletions .github/workflows/issue236-windows.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
name: Issue 236 Windows diagnostics

on:
pull_request:
paths:
- ".github/workflows/issue236-windows.yml"
- "test/issue236_windows.jl"
- "src/**"
- "Project.toml"
workflow_dispatch:

jobs:
build-yggdrasil-variant:
name: Build Yggdrasil variant / ${{ matrix.variant }}
if: github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
include:
- variant: fno-strict-aliasing
cflags: -fno-strict-aliasing
- variant: fno-tree-vectorize
cflags: -fno-tree-vectorize
steps:
- uses: julia-actions/setup-julia@v2
with:
version: "1.12"

- uses: actions/checkout@v5
with:
repository: JuliaPackaging/Yggdrasil
path: Yggdrasil

- name: Patch MariaDB Connector/C recipe
shell: bash
run: |
set -euo pipefail
cd Yggdrasil/M/MariaDB_Connector_C
perl -0pi -e 's/\Q-Wno-error -Wno-incompatible-pointer-types\E/-Wno-error -Wno-incompatible-pointer-types $ENV{EXTRA_CFLAGS}/' build_tarballs.jl
grep -n -- "$EXTRA_CFLAGS" build_tarballs.jl
env:
EXTRA_CFLAGS: ${{ matrix.cflags }}

- name: Build Windows tarball
shell: bash
run: |
set -euo pipefail
cd Yggdrasil/M/MariaDB_Connector_C
julia --project=../.. --startup-file=no -e 'using Pkg; Pkg.instantiate()'
julia --project=../.. --startup-file=no build_tarballs.jl --verbose x86_64-w64-mingw32
mkdir -p "$GITHUB_WORKSPACE/variant"
cp products/MariaDB_Connector_C.v*.x86_64-w64-mingw32.tar.gz "$GITHUB_WORKSPACE/variant/"
cp products/MariaDB_Connector_C-logs.v*.x86_64-w64-mingw32.tar.gz "$GITHUB_WORKSPACE/variant/"

- uses: actions/upload-artifact@v5
with:
name: mariadb-connector-c-${{ matrix.variant }}
path: variant/*.tar.gz

issue236:
name: Windows ${{ matrix.os }} / ${{ matrix.connector }}
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os:
- windows-2022
- windows-2025
connector:
- jll-default
- jll-3.3.9
- official-3.4.9

steps:
- uses: actions/checkout@v5

- uses: julia-actions/setup-julia@v2
with:
version: "1"
arch: x64

- name: Start MySQL
id: setup-mysql
uses: shogo82148/actions-setup-mysql@v1.51.0
with:
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_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

issue236-yggdrasil-variant:
name: Windows ${{ matrix.os }} / yggdrasil-${{ matrix.variant }}
if: github.event_name == 'workflow_dispatch'
needs: build-yggdrasil-variant
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os:
- windows-2022
- windows-2025
variant:
- fno-strict-aliasing
- fno-tree-vectorize

steps:
- uses: actions/checkout@v5

- uses: julia-actions/setup-julia@v2
with:
version: "1"
arch: x64

- name: Start MySQL
uses: shogo82148/actions-setup-mysql@v1.51.0
with:
mysql-version: "8.4"
root-password: root

- uses: actions/download-artifact@v5
with:
name: mariadb-connector-c-${{ matrix.variant }}
path: ${{ runner.temp }}/variant

- name: Use Yggdrasil variant
shell: pwsh
run: |
$target = Join-Path $env:RUNNER_TEMP "mariadb-connector-c-${env:MYSQLJL_CONNECTOR_VARIANT}"
New-Item -ItemType Directory -Force -Path $target | Out-Null
$tarball = Get-ChildItem (Join-Path $env:RUNNER_TEMP "variant") -Filter "MariaDB_Connector_C.v*.x86_64-w64-mingw32.tar.gz" | Select-Object -First 1
if ($null -eq $tarball) {
throw "Could not find built Connector/C tarball"
}
tar -xzf $tarball.FullName -C $target

$dll = Join-Path $target "bin/libmariadb.dll"
$plugin = Join-Path $target "lib/mariadb/plugin"
if (!(Test-Path $dll)) {
throw "Could not find libmariadb.dll at $dll"
}
if (!(Test-Path (Join-Path $plugin "caching_sha2_password.dll"))) {
throw "Could not find Connector/C plugin directory at $plugin"
}

"MYSQLJL_LIBMARIADB_OVERRIDE=$dll" >> $env:GITHUB_ENV
"MYSQLJL_PLUGIN_DIR_OVERRIDE=$plugin" >> $env:GITHUB_ENV
"$(Split-Path -Parent $dll)" >> $env:GITHUB_PATH
env:
MYSQLJL_CONNECTOR_VARIANT: ${{ matrix.variant }}

- name: Run issue 236 diagnostic
shell: pwsh
env:
MYSQLJL_HOST: 127.0.0.1
MYSQLJL_PORT: "3306"
MYSQLJL_USER: root
MYSQLJL_PASSWORD: root
MYSQLJL_CONNECTOR: yggdrasil-${{ matrix.variant }}
MYSQLJL_JLL_VERSION: default
run: julia --startup-file=no test/issue236_windows.jl
4 changes: 2 additions & 2 deletions src/api/API.jl
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -37,4 +37,4 @@ include("capi.jl")
# Prepared statement API functions
include("papi.jl")

end # module
end # module
6 changes: 4 additions & 2 deletions src/api/ccalls.jl
Original file line numberDiff line numberDiff line change
@@ -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
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
200 changes: 200 additions & 0 deletions .github/workflows/issue236-windows.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
name: Issue 236 Windows diagnostics

on:
pull_request:
paths:
- ".github/workflows/issue236-windows.yml"
- "test/issue236_windows.jl"
- "src/**"
- "Project.toml"
workflow_dispatch:

jobs:
build-yggdrasil-variant:
name: Build Yggdrasil variant / ${{ matrix.variant }}
if: github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
include:
- variant: fno-strict-aliasing
cflags: -fno-strict-aliasing
- variant: fno-tree-vectorize
cflags: -fno-tree-vectorize
steps:
- uses: julia-actions/setup-julia@v2
with:
version: "1.12"

- uses: actions/checkout@v5
with:
repository: JuliaPackaging/Yggdrasil
path: Yggdrasil

- name: Patch MariaDB Connector/C recipe
shell: bash
run: |
set -euo pipefail
cd Yggdrasil/M/MariaDB_Connector_C
perl -0pi -e 's/\Q-Wno-error -Wno-incompatible-pointer-types\E/-Wno-error -Wno-incompatible-pointer-types $ENV{EXTRA_CFLAGS}/' build_tarballs.jl
grep -n -- "$EXTRA_CFLAGS" build_tarballs.jl
env:
EXTRA_CFLAGS: ${{ matrix.cflags }}

- name: Build Windows tarball
shell: bash
run: |
set -euo pipefail
cd Yggdrasil/M/MariaDB_Connector_C
julia --project=../.. --startup-file=no -e 'using Pkg; Pkg.instantiate()'
julia --project=../.. --startup-file=no build_tarballs.jl --verbose x86_64-w64-mingw32
mkdir -p "$GITHUB_WORKSPACE/variant"
cp products/MariaDB_Connector_C.v*.x86_64-w64-mingw32.tar.gz "$GITHUB_WORKSPACE/variant/"
cp products/MariaDB_Connector_C-logs.v*.x86_64-w64-mingw32.tar.gz "$GITHUB_WORKSPACE/variant/"

- uses: actions/upload-artifact@v5
with:
name: mariadb-connector-c-${{ matrix.variant }}
path: variant/*.tar.gz

issue236:
name: Windows ${{ matrix.os }} / ${{ matrix.connector }}
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os:
- windows-2022
- windows-2025
connector:
- jll-default
- jll-3.3.9
- official-3.4.9

steps:
- uses: actions/checkout@v5

- uses: julia-actions/setup-julia@v2
with:
version: "1"
arch: x64

- name: Start MySQL
id: setup-mysql
uses: shogo82148/actions-setup-mysql@v1.51.0
with:
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_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

issue236-yggdrasil-variant:
name: Windows ${{ matrix.os }} / yggdrasil-${{ matrix.variant }}
if: github.event_name == 'workflow_dispatch'
needs: build-yggdrasil-variant
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os:
- windows-2022
- windows-2025
variant:
- fno-strict-aliasing
- fno-tree-vectorize

steps:
- uses: actions/checkout@v5

- uses: julia-actions/setup-julia@v2
with:
version: "1"
arch: x64

- name: Start MySQL
uses: shogo82148/actions-setup-mysql@v1.51.0
with:
mysql-version: "8.4"
root-password: root

- uses: actions/download-artifact@v5
with:
name: mariadb-connector-c-${{ matrix.variant }}
path: ${{ runner.temp }}/variant

- name: Use Yggdrasil variant
shell: pwsh
run: |
$target = Join-Path $env:RUNNER_TEMP "mariadb-connector-c-${env:MYSQLJL_CONNECTOR_VARIANT}"
New-Item -ItemType Directory -Force -Path $target | Out-Null
$tarball = Get-ChildItem (Join-Path $env:RUNNER_TEMP "variant") -Filter "MariaDB_Connector_C.v*.x86_64-w64-mingw32.tar.gz" | Select-Object -First 1
if ($null -eq $tarball) {
throw "Could not find built Connector/C tarball"
}
tar -xzf $tarball.FullName -C $target

$dll = Join-Path $target "bin/libmariadb.dll"
$plugin = Join-Path $target "lib/mariadb/plugin"
if (!(Test-Path $dll)) {
throw "Could not find libmariadb.dll at $dll"
}
if (!(Test-Path (Join-Path $plugin "caching_sha2_password.dll"))) {
throw "Could not find Connector/C plugin directory at $plugin"
}

"MYSQLJL_LIBMARIADB_OVERRIDE=$dll" >> $env:GITHUB_ENV
"MYSQLJL_PLUGIN_DIR_OVERRIDE=$plugin" >> $env:GITHUB_ENV
"$(Split-Path -Parent $dll)" >> $env:GITHUB_PATH
env:
MYSQLJL_CONNECTOR_VARIANT: ${{ matrix.variant }}

- name: Run issue 236 diagnostic
shell: pwsh
env:
MYSQLJL_HOST: 127.0.0.1
MYSQLJL_PORT: "3306"
MYSQLJL_USER: root
MYSQLJL_PASSWORD: root
MYSQLJL_CONNECTOR: yggdrasil-${{ matrix.variant }}
MYSQLJL_JLL_VERSION: default
run: julia --startup-file=no test/issue236_windows.jl
4 changes: 2 additions & 2 deletions src/api/API.jl
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -37,4 +37,4 @@ include("capi.jl")
# Prepared statement API functions
include("papi.jl")

end # module
end # module
6 changes: 4 additions & 2 deletions src/api/ccalls.jl
Original file line numberDiff line numberDiff line change
@@ -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
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
200 changes: 200 additions & 0 deletions .github/workflows/issue236-windows.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
name: Issue 236 Windows diagnostics

on:
pull_request:
paths:
- ".github/workflows/issue236-windows.yml"
- "test/issue236_windows.jl"
- "src/**"
- "Project.toml"
workflow_dispatch:

jobs:
build-yggdrasil-variant:
name: Build Yggdrasil variant / ${{ matrix.variant }}
if: github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
include:
- variant: fno-strict-aliasing
cflags: -fno-strict-aliasing
- variant: fno-tree-vectorize
cflags: -fno-tree-vectorize
steps:
- uses: julia-actions/setup-julia@v2
with:
version: "1.12"

- uses: actions/checkout@v5
with:
repository: JuliaPackaging/Yggdrasil
path: Yggdrasil

- name: Patch MariaDB Connector/C recipe
shell: bash
run: |
set -euo pipefail
cd Yggdrasil/M/MariaDB_Connector_C
perl -0pi -e 's/\Q-Wno-error -Wno-incompatible-pointer-types\E/-Wno-error -Wno-incompatible-pointer-types $ENV{EXTRA_CFLAGS}/' build_tarballs.jl
grep -n -- "$EXTRA_CFLAGS" build_tarballs.jl
env:
EXTRA_CFLAGS: ${{ matrix.cflags }}

- name: Build Windows tarball
shell: bash
run: |
set -euo pipefail
cd Yggdrasil/M/MariaDB_Connector_C
julia --project=../.. --startup-file=no -e 'using Pkg; Pkg.instantiate()'
julia --project=../.. --startup-file=no build_tarballs.jl --verbose x86_64-w64-mingw32
mkdir -p "$GITHUB_WORKSPACE/variant"
cp products/MariaDB_Connector_C.v*.x86_64-w64-mingw32.tar.gz "$GITHUB_WORKSPACE/variant/"
cp products/MariaDB_Connector_C-logs.v*.x86_64-w64-mingw32.tar.gz "$GITHUB_WORKSPACE/variant/"

- uses: actions/upload-artifact@v5
with:
name: mariadb-connector-c-${{ matrix.variant }}
path: variant/*.tar.gz

issue236:
name: Windows ${{ matrix.os }} / ${{ matrix.connector }}
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os:
- windows-2022
- windows-2025
connector:
- jll-default
- jll-3.3.9
- official-3.4.9

steps:
- uses: actions/checkout@v5

- uses: julia-actions/setup-julia@v2
with:
version: "1"
arch: x64

- name: Start MySQL
id: setup-mysql
uses: shogo82148/actions-setup-mysql@v1.51.0
with:
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_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

issue236-yggdrasil-variant:
name: Windows ${{ matrix.os }} / yggdrasil-${{ matrix.variant }}
if: github.event_name == 'workflow_dispatch'
needs: build-yggdrasil-variant
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os:
- windows-2022
- windows-2025
variant:
- fno-strict-aliasing
- fno-tree-vectorize

steps:
- uses: actions/checkout@v5

- uses: julia-actions/setup-julia@v2
with:
version: "1"
arch: x64

- name: Start MySQL
uses: shogo82148/actions-setup-mysql@v1.51.0
with:
mysql-version: "8.4"
root-password: root

- uses: actions/download-artifact@v5
with:
name: mariadb-connector-c-${{ matrix.variant }}
path: ${{ runner.temp }}/variant

- name: Use Yggdrasil variant
shell: pwsh
run: |
$target = Join-Path $env:RUNNER_TEMP "mariadb-connector-c-${env:MYSQLJL_CONNECTOR_VARIANT}"
New-Item -ItemType Directory -Force -Path $target | Out-Null
$tarball = Get-ChildItem (Join-Path $env:RUNNER_TEMP "variant") -Filter "MariaDB_Connector_C.v*.x86_64-w64-mingw32.tar.gz" | Select-Object -First 1
if ($null -eq $tarball) {
throw "Could not find built Connector/C tarball"
}
tar -xzf $tarball.FullName -C $target

$dll = Join-Path $target "bin/libmariadb.dll"
$plugin = Join-Path $target "lib/mariadb/plugin"
if (!(Test-Path $dll)) {
throw "Could not find libmariadb.dll at $dll"
}
if (!(Test-Path (Join-Path $plugin "caching_sha2_password.dll"))) {
throw "Could not find Connector/C plugin directory at $plugin"
}

"MYSQLJL_LIBMARIADB_OVERRIDE=$dll" >> $env:GITHUB_ENV
"MYSQLJL_PLUGIN_DIR_OVERRIDE=$plugin" >> $env:GITHUB_ENV
"$(Split-Path -Parent $dll)" >> $env:GITHUB_PATH
env:
MYSQLJL_CONNECTOR_VARIANT: ${{ matrix.variant }}

- name: Run issue 236 diagnostic
shell: pwsh
env:
MYSQLJL_HOST: 127.0.0.1
MYSQLJL_PORT: "3306"
MYSQLJL_USER: root
MYSQLJL_PASSWORD: root
MYSQLJL_CONNECTOR: yggdrasil-${{ matrix.variant }}
MYSQLJL_JLL_VERSION: default
run: julia --startup-file=no test/issue236_windows.jl
4 changes: 2 additions & 2 deletions src/api/API.jl
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -37,4 +37,4 @@ include("capi.jl")
# Prepared statement API functions
include("papi.jl")

end # module
end # module
6 changes: 4 additions & 2 deletions src/api/ccalls.jl
Original file line numberDiff line numberDiff line change
@@ -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
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
200 changes: 200 additions & 0 deletions .github/workflows/issue236-windows.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
name: Issue 236 Windows diagnostics

on:
pull_request:
paths:
- ".github/workflows/issue236-windows.yml"
- "test/issue236_windows.jl"
- "src/**"
- "Project.toml"
workflow_dispatch:

jobs:
build-yggdrasil-variant:
name: Build Yggdrasil variant / ${{ matrix.variant }}
if: github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
include:
- variant: fno-strict-aliasing
cflags: -fno-strict-aliasing
- variant: fno-tree-vectorize
cflags: -fno-tree-vectorize
steps:
- uses: julia-actions/setup-julia@v2
with:
version: "1.12"

- uses: actions/checkout@v5
with:
repository: JuliaPackaging/Yggdrasil
path: Yggdrasil

- name: Patch MariaDB Connector/C recipe
shell: bash
run: |
set -euo pipefail
cd Yggdrasil/M/MariaDB_Connector_C
perl -0pi -e 's/\Q-Wno-error -Wno-incompatible-pointer-types\E/-Wno-error -Wno-incompatible-pointer-types $ENV{EXTRA_CFLAGS}/' build_tarballs.jl
grep -n -- "$EXTRA_CFLAGS" build_tarballs.jl
env:
EXTRA_CFLAGS: ${{ matrix.cflags }}

- name: Build Windows tarball
shell: bash
run: |
set -euo pipefail
cd Yggdrasil/M/MariaDB_Connector_C
julia --project=../.. --startup-file=no -e 'using Pkg; Pkg.instantiate()'
julia --project=../.. --startup-file=no build_tarballs.jl --verbose x86_64-w64-mingw32
mkdir -p "$GITHUB_WORKSPACE/variant"
cp products/MariaDB_Connector_C.v*.x86_64-w64-mingw32.tar.gz "$GITHUB_WORKSPACE/variant/"
cp products/MariaDB_Connector_C-logs.v*.x86_64-w64-mingw32.tar.gz "$GITHUB_WORKSPACE/variant/"

- uses: actions/upload-artifact@v5
with:
name: mariadb-connector-c-${{ matrix.variant }}
path: variant/*.tar.gz

issue236:
name: Windows ${{ matrix.os }} / ${{ matrix.connector }}
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os:
- windows-2022
- windows-2025
connector:
- jll-default
- jll-3.3.9
- official-3.4.9

steps:
- uses: actions/checkout@v5

- uses: julia-actions/setup-julia@v2
with:
version: "1"
arch: x64

- name: Start MySQL
id: setup-mysql
uses: shogo82148/actions-setup-mysql@v1.51.0
with:
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_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

issue236-yggdrasil-variant:
name: Windows ${{ matrix.os }} / yggdrasil-${{ matrix.variant }}
if: github.event_name == 'workflow_dispatch'
needs: build-yggdrasil-variant
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os:
- windows-2022
- windows-2025
variant:
- fno-strict-aliasing
- fno-tree-vectorize

steps:
- uses: actions/checkout@v5

- uses: julia-actions/setup-julia@v2
with:
version: "1"
arch: x64

- name: Start MySQL
uses: shogo82148/actions-setup-mysql@v1.51.0
with:
mysql-version: "8.4"
root-password: root

- uses: actions/download-artifact@v5
with:
name: mariadb-connector-c-${{ matrix.variant }}
path: ${{ runner.temp }}/variant

- name: Use Yggdrasil variant
shell: pwsh
run: |
$target = Join-Path $env:RUNNER_TEMP "mariadb-connector-c-${env:MYSQLJL_CONNECTOR_VARIANT}"
New-Item -ItemType Directory -Force -Path $target | Out-Null
$tarball = Get-ChildItem (Join-Path $env:RUNNER_TEMP "variant") -Filter "MariaDB_Connector_C.v*.x86_64-w64-mingw32.tar.gz" | Select-Object -First 1
if ($null -eq $tarball) {
throw "Could not find built Connector/C tarball"
}
tar -xzf $tarball.FullName -C $target

$dll = Join-Path $target "bin/libmariadb.dll"
$plugin = Join-Path $target "lib/mariadb/plugin"
if (!(Test-Path $dll)) {
throw "Could not find libmariadb.dll at $dll"
}
if (!(Test-Path (Join-Path $plugin "caching_sha2_password.dll"))) {
throw "Could not find Connector/C plugin directory at $plugin"
}

"MYSQLJL_LIBMARIADB_OVERRIDE=$dll" >> $env:GITHUB_ENV
"MYSQLJL_PLUGIN_DIR_OVERRIDE=$plugin" >> $env:GITHUB_ENV
"$(Split-Path -Parent $dll)" >> $env:GITHUB_PATH
env:
MYSQLJL_CONNECTOR_VARIANT: ${{ matrix.variant }}

- name: Run issue 236 diagnostic
shell: pwsh
env:
MYSQLJL_HOST: 127.0.0.1
MYSQLJL_PORT: "3306"
MYSQLJL_USER: root
MYSQLJL_PASSWORD: root
MYSQLJL_CONNECTOR: yggdrasil-${{ matrix.variant }}
MYSQLJL_JLL_VERSION: default
run: julia --startup-file=no test/issue236_windows.jl
4 changes: 2 additions & 2 deletions src/api/API.jl
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -37,4 +37,4 @@ include("capi.jl")
# Prepared statement API functions
include("papi.jl")

end # module
end # module
6 changes: 4 additions & 2 deletions src/api/ccalls.jl
Original file line numberDiff line numberDiff line change
@@ -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
Expand Down
Loading
Loading