summaryrefslogtreecommitdiff
path: root/support-files/mysql.server.sh
diff options
context:
space:
mode:
authorRucha Deodhar <rucha.deodhar@mariadb.com>2021-06-08 11:25:47 +0530
committerRucha Deodhar <rucha.deodhar@mariadb.com>2021-07-12 16:07:08 +0530
commitf88d130e710338607adf2517bef436de624c76b9 (patch)
treeab325e5c8f5440ecc0db25706506c3e53aa92288 /support-files/mysql.server.sh
parent35294053b281294bb49a6217da07b93eb6c2595b (diff)
downloadmariadb-git-f88d130e710338607adf2517bef436de624c76b9.tar.gz
MDEV-24248: my_print_defaults is not taking all the values when using -e
option which is called from mysql.server (extra_args). Fix: change mysql.server script to use --defaults-extra-file instead of -e
Diffstat (limited to 'support-files/mysql.server.sh')
-rw-r--r--support-files/mysql.server.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index cefb3225e9e..f26b95aea78 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -200,11 +200,11 @@ su_kill() {
extra_args=""
if test -r "$basedir/my.cnf"
then
- extra_args="-e $basedir/my.cnf"
+ extra_args="--defaults-extra-file=$basedir/my.cnf"
else
if test -r "$datadir/my.cnf"
then
- extra_args="-e $datadir/my.cnf"
+ extra_args="--defaults-extra-file=$datadir/my.cnf"
fi
fi