Revert "MDEV-24248: my_print_defaults is not taking all the values when using -e"

This reverts commit f88d130e710338607adf2517bef436de624c76b9.

mysql-test/main/my_print_defaults.result

@@ -1,18 +0,0 @@
-#
-# Beginning of 10.5 Test
-#
-#
-# MDEV-24248: my_print_defaults is not taking all the values when using
-# -e option which is called from mysql.server (extra_args).
-#
-# checking for mysql.server
---key_buffer_size=20M
---max_allowed_packet=250M
---table_open_cache=1000
---table_definition_cache=2000
---read_buffer_size=1M
---thread_cache_size=8
---max_connections=1024
---long_query_time=60
---slow_query_log=1
-# End of 10.5 test

mysql-test/main/my_print_defaults.test

@@ -1,29 +0,0 @@
---echo #
---echo # Beginning of 10.5 Test
---echo #
---echo #
---echo # MDEV-24248: my_print_defaults is not taking all the values when using
---echo # -e option which is called from mysql.server (extra_args).
---echo #
-
---echo # checking for mysql.server
-
---write_file $MYSQLTEST_VARDIR/tmp/tmp1.cnf
-
-[mariadb]
-key_buffer_size=20M
-max_allowed_packet=250M
-table_open_cache=1000
-table_definition_cache=2000
-read_buffer_size=1M
-thread_cache_size=8
-max_connections=1024
-long_query_time=60
-slow_query_log=1
-EOF
-
---exec $MYSQL_MY_PRINT_DEFAULTS --defaults-extra-file=$MYSQLTEST_VARDIR/tmp/tmp1.cnf --mysqld mysql.server
-
---remove_file $MYSQLTEST_VARDIR/tmp/tmp1.cnf
-
---echo # End of 10.5 test

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