Skip to content

Commit caec03c

Browse files
committed
MDEV-35907 debian-start script fails when using non-standard socket path
consistently use --defaults-extra-file for all command-line tools
1 parent 9a0ac0c commit caec03c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

debian/additions/debian-start

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ if [ -f /etc/default/mariadb ]; then
1717
. /etc/default/mariadb
1818
fi
1919

20-
MARIADB="/usr/bin/mariadb --defaults-file=/etc/mysql/debian.cnf"
21-
MYADMIN="/usr/bin/mariadb-admin --defaults-file=/etc/mysql/debian.cnf"
20+
MARIADB="/usr/bin/mariadb --defaults-extra-file=/etc/mysql/debian.cnf"
21+
MYADMIN="/usr/bin/mariadb-admin --defaults-extra-file=/etc/mysql/debian.cnf"
2222
# Don't run full mariadb-upgrade on every server restart, use --version-check to do it only once
2323
MYUPGRADE="/usr/bin/mariadb-upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check --silent"
24-
MYCHECK="/usr/bin/mariadb-check --defaults-file=/etc/mysql/debian.cnf"
24+
MYCHECK="/usr/bin/mariadb-check --defaults-extra-file=/etc/mysql/debian.cnf"
2525
MYCHECK_SUBJECT="WARNING: mariadb-check has found corrupt tables"
2626
MYCHECK_PARAMS="--all-databases --fast --silent"
2727
MYCHECK_RCPT="${MYCHECK_RCPT:-root}"

0 commit comments

Comments
 (0)