Skip to content

PostgreSQL backup tool with Point-In-Time-Recovery and restore verification

fix(tools): rebuild x64 mariadb client against libedit

Pawel Fraczykbc634619af9f
diff --git a/assets/tools/x64/mariadb/mariadb-12.1/bin/mariadb b/assets/tools/x64/mariadb/mariadb-12.1/bin/mariadb
index 1eeaf6c0..7aaed60f 100755
Binary files a/assets/tools/x64/mariadb/mariadb-12.1/bin/mariadb and b/assets/tools/x64/mariadb/mariadb-12.1/bin/mariadb differ
diff --git a/assets/tools/x64/mariadb/mariadb-12.1/bin/mariadb-dump b/assets/tools/x64/mariadb/mariadb-12.1/bin/mariadb-dump
index c815a226..432b842b 100755
Binary files a/assets/tools/x64/mariadb/mariadb-12.1/bin/mariadb-dump and b/assets/tools/x64/mariadb/mariadb-12.1/bin/mariadb-dump differ
diff --git a/tools/refresh-mariadb-x64-libedit.sh b/tools/refresh-mariadb-x64-libedit.sh
new file mode 100755
index 00000000..2bf6e5ee
--- /dev/null
+++ b/tools/refresh-mariadb-x64-libedit.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+# Rebuild assets/tools/x64/mariadb/mariadb-12.1/bin/ using the libedit-linked
+# client from MariaDB's official APT repo. Mirrors how the arm tree is built.
+#
+# Run from the databasus repo root. Requires Docker with linux/amd64 support
+# (works natively on amd64 hosts, or via qemu on arm hosts).
+set -euo pipefail
+
+REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+DEST="$REPO_ROOT/assets/tools/x64/mariadb/mariadb-12.1/bin"
+WORK="$(mktemp -d)"
+trap 'rm -rf "$WORK"' EXIT
+
+docker run --rm --platform linux/amd64 -v "$WORK:/out" debian:bookworm-slim bash -eu <<'INNER'
+export DEBIAN_FRONTEND=noninteractive
+apt-get update -qq
+apt-get install -y --no-install-recommends \
+ ca-certificates curl gnupg lsb-release apt-transport-https >/dev/null
+curl -fsSL https://r.mariadb.com/downloads/mariadb_repo_setup \
+ | bash -s -- --mariadb-server-version=12.1 >/dev/null 2>&1
+apt-get update -qq
+apt-get install -y --no-install-recommends mariadb-client >/dev/null
+cp /usr/bin/mariadb /out/mariadb
+cp /usr/bin/mariadb-dump /out/mariadb-dump
+chmod +x /out/mariadb /out/mariadb-dump
+/out/mariadb --version
+/out/mariadb-dump --version
+INNER
+
+install -m 0755 "$WORK/mariadb" "$DEST/mariadb"
+install -m 0755 "$WORK/mariadb-dump" "$DEST/mariadb-dump"
+
+echo
+echo "Installed into $DEST"
+sha256sum "$DEST/mariadb" "$DEST/mariadb-dump"
+"$DEST/mariadb" --version