diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-06-08 11:25:47 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-07-12 16:07:08 +0530 |
| commit | f88d130e710338607adf2517bef436de624c76b9 (patch) | |
| tree | ab325e5c8f5440ecc0db25706506c3e53aa92288 | |
| parent | 35294053b281294bb49a6217da07b93eb6c2595b (diff) | |
| download | mariadb-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
| -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, 49 insertions, 2 deletions
diff --git a/mysql-test/main/my_print_defaults.result b/mysql-test/main/my_print_defaults.result new file mode 100644 index 00000000000..5303fa55a9e --- /dev/null +++ b/mysql-test/main/my_print_defaults.result @@ -0,0 +1,18 @@ +# +# 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 new file mode 100644 index 00000000000..cc467ff09dc --- /dev/null +++ b/mysql-test/main/my_print_defaults.test @@ -0,0 +1,29 @@ +--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 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 |