diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-07-15 17:07:22 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-07-15 17:07:22 +0530 |
| commit | 826eab3f9b28dbc370e5d7a2f81dc42d2f09ed40 (patch) | |
| tree | 5b37fca0fc4b626d12b8af3b458991528dec90df | |
| parent | f88d130e710338607adf2517bef436de624c76b9 (diff) | |
| download | mariadb-git-826eab3f9b28dbc370e5d7a2f81dc42d2f09ed40.tar.gz | |
Revert "MDEV-24248: my_print_defaults is not taking all the values when using -e"
This reverts commit f88d130e710338607adf2517bef436de624c76b9.
| -rw-r--r-- | mysql-test/main/my_print_defaults.result | 18 | ||||
| -rw-r--r-- | mysql-test/main/my_print_defaults.test | 29 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 4 |
3 files changed, 2 insertions, 49 deletions
diff --git a/mysql-test/main/my_print_defaults.result b/mysql-test/main/my_print_defaults.result deleted file mode 100644 index 5303fa55a9e..00000000000 --- a/mysql-test/main/my_print_defaults.result +++ /dev/null @@ -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 diff --git a/mysql-test/main/my_print_defaults.test b/mysql-test/main/my_print_defaults.test deleted file mode 100644 index cc467ff09dc..00000000000 --- a/mysql-test/main/my_print_defaults.test +++ /dev/null @@ -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 diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index f26b95aea78..cefb3225e9e 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="--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 |