From 59e5e036552aa486e0ae6072fd48193143a70fcc Mon Sep 17 00:00:00 2001
From: Radon Rosborough <radon.neon@gmail.com>
Date: Thu, 21 Jan 2021 22:10:05 -0800
Subject: [PATCH] At long last, fix MariaDB tests too

---
 langs/mariadb.yaml | 8 ++++----
 langs/mysql.yaml   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/langs/mariadb.yaml b/langs/mariadb.yaml
index f47ee7d..f86b33d 100644
--- a/langs/mariadb.yaml
+++ b/langs/mariadb.yaml
@@ -19,8 +19,8 @@ install:
 
 repl: |
   rm -rf data
-  /opt/mariadb/scripts/mariadb-install-db --user="$(id -un)"
-  (/opt/mariadb/bin/mysqld --datadir="$PWD/data" --socket="$PWD/socket" --skip-networking &)
+  /opt/mariadb/scripts/mariadb-install-db --no-defaults --user="$(id -un)"
+  (/opt/mariadb/bin/mysqld --no-defaults --datadir="$PWD/data" --socket="$PWD/socket" --skip-networking &)
   until [[ -e socket ]]; do
       sleep 0.01
   done
@@ -35,8 +35,8 @@ template: |
 run: |
   set -e
   rm -rf data
-  /opt/mariadb/scripts/mariadb-install-db --user="$(id -un)"
-  (/opt/mariadb/bin/mysqld --datadir="$PWD/data" --socket="$PWD/socket" --skip-networking &)
+  /opt/mariadb/scripts/mariadb-install-db --no-defaults --user="$(id -un)"
+  (/opt/mariadb/bin/mysqld --no-defaults --datadir="$PWD/data" --socket="$PWD/socket" --skip-networking &)
   until [[ -e socket ]]; do
       sleep 0.01
   done
diff --git a/langs/mysql.yaml b/langs/mysql.yaml
index 86378b6..7f64f57 100644
--- a/langs/mysql.yaml
+++ b/langs/mysql.yaml
@@ -10,8 +10,8 @@ install:
 
 repl: |
   rm -rf data
-  mysqld -h "$PWD/data" --log-error="$PWD/error.log" --initialize-insecure
-  (mysqld -h "$PWD/data" --log-error="$PWD/error.log" --socket="$PWD/socket" --pid-file="$PWD/pid-file" --mysqlx=OFF --skip-networking &)
+  mysqld --no-defaults -h "$PWD/data" --initialize-insecure
+  (mysqld --no-defaults -h "$PWD/data" --socket="$PWD/socket" --pid-file="$PWD/pid-file" --mysqlx=OFF --skip-networking &)
   until [[ -e socket ]]; do
       sleep 0.01
   done
@@ -26,8 +26,8 @@ template: |
 run: |
   set -e
   rm -rf data
-  mysqld -h "$PWD/data" --log-error="$PWD/error.log" --initialize-insecure
-  (mysqld -h "$PWD/data" --log-error="$PWD/error.log" --socket="$PWD/socket" --pid-file="$PWD/pid-file" --mysqlx=OFF --skip-networking &)
+  mysqld --no-defaults -h "$PWD/data" --initialize-insecure
+  (mysqld --no-defaults -h "$PWD/data" --socket="$PWD/socket" --pid-file="$PWD/pid-file" --mysqlx=OFF --skip-networking &)
   until [[ -e socket ]]; do
       sleep 0.01
   done