At long last, fix MariaDB tests too

This commit is contained in:
Radon Rosborough 2021-01-21 22:10:05 -08:00
parent 110995dfd9
commit 59e5e03655
2 changed files with 8 additions and 8 deletions

View File

@ -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

View File

@ -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