maria-developers team mailing list archive

[Sergei Golubchik <serg@xxxxxxxxxxx>]

Hi, Rucha!

On Jul 12, Rucha Deodhar wrote:
> revision-id: 85186734823 (mariadb-10.5.4-665-g85186734823)
> parent(s): bf5c050fd28
> author: Rucha Deodhar <rucha.deodhar@xxxxxxxxxxx>
> committer: Rucha Deodhar <rucha.deodhar@xxxxxxxxxxx>
> timestamp: 2021-06-14 10:27:13 +0530
> message:
> 
> 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
> 
> diff --git a/mysql-test/main/my_print_defaults.test b/mysql-test/main/my_print_defaults.test
> --- /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-10.5]

don't use the version number in the test - you're forcing some poor soul
to update the test on merges for every new version.

> +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..8504e4def4b 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-file-name=$basedir/my.cnf"

eh. -e is --defaults-extra-file
same below.

>  else
>    if test -r "$datadir/my.cnf"
>    then
> -    extra_args="-e $datadir/my.cnf"
> +    extra_args="--defaults-file-name=$datadir/my.cnf"
>    fi
>  fi
>  
> 
Regards,
Sergei
VP of MariaDB Server Engineering
and security@xxxxxxxxxxx