Revert "MDEV-24248: my_print_defaults is not taking all the values wh…

…en using -e" This reverts commit f88d130.
MariaDB · Jul 15, 2021 · 826eab3 · 826eab3
1 parent f88d130
commit 826eab3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 49 deletions.
diff --git a/mysql-test/main/my_print_defaults.result b/mysql-test/main/my_print_defaults.result
diff --git a/mysql-test/main/my_print_defaults.test b/mysql-test/main/my_print_defaults.test
diff --git 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="--defaults-extra-file=$basedir/my.cnf"
+  extra_args="-e $basedir/my.cnf"
 else
   if test -r "$datadir/my.cnf"
   then
-    extra_args="--defaults-extra-file=$datadir/my.cnf"
+    extra_args="-e $datadir/my.cnf"
   fi
 fi