diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-09-01 19:09:01 +0530 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-01-26 18:43:06 +0100 |
| commit | 5217211e071d1c9943026b429baaaffe8ef8414a (patch) | |
| tree | a1b2e84d10d81b2c0908d769e62b6bb765ac5e5e /mysql-test/main/mysqldump.test | |
| parent | b18697fd3eb9bc2d88c03869109bcebcdf55a9a1 (diff) | |
| download | mariadb-git-5217211e071d1c9943026b429baaaffe8ef8414a.tar.gz | |
MDEV-26238: Remove inconsistent behaviour of --default-* options
in my_print_defaults
Analysis: --defaults* option is recognized anywhere in the commandline
instead of only at the beginning because handle_options() recognizes
options in any order.
Fix: use get_defaults_options() which recognizes --defaults* options only at
the beginning. After this is done, we only want to recognize other options
given in any order which can be done using handle_options(). So only skip
--defaults* options and pass rest of them to handle_options().
Also, removed -e, -g and -c because only my_print_defaults supports them.
Diffstat (limited to 'mysql-test/main/mysqldump.test')
| -rw-r--r-- | mysql-test/main/mysqldump.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/mysqldump.test b/mysql-test/main/mysqldump.test index 3b8130be5f8..0786cf6f803 100644 --- a/mysql-test/main/mysqldump.test +++ b/mysql-test/main/mysqldump.test @@ -964,8 +964,8 @@ DROP TABLE t1, t2; [mysqltest1] port=1234 EOF ---exec $MYSQL_MY_PRINT_DEFAULTS -c $MYSQLTEST_VARDIR/tmp/tmp.cnf mysqltest1 ---exec $MYSQL_MY_PRINT_DEFAULTS -e $MYSQLTEST_VARDIR/tmp/tmp.cnf mysqltest1 mysqltest1 +--exec $MYSQL_MY_PRINT_DEFAULTS --defaults-file=$MYSQLTEST_VARDIR/tmp/tmp.cnf mysqltest1 +--exec $MYSQL_MY_PRINT_DEFAULTS --defaults-extra-file=$MYSQLTEST_VARDIR/tmp/tmp.cnf mysqltest1 mysqltest1 --remove_file $MYSQLTEST_VARDIR/tmp/tmp.cnf --echo # |