diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-03-06 23:28:26 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-03-06 23:28:26 +0100 |
| commit | 440452628d95476674922c6c097825509a002d8d (patch) | |
| tree | c6bceadee16d4286de4d3f37eec43bb250077502 /mysql-test/main/mysqld--defaults-file.test | |
| parent | f8ab5ca374243977f331cdf6e569386230a7fddb (diff) | |
| parent | 75d286c2cc46092148f13b6b9026f52a54926a84 (diff) | |
| download | mariadb-git-440452628d95476674922c6c097825509a002d8d.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/mysqld--defaults-file.test')
| -rw-r--r-- | mysql-test/main/mysqld--defaults-file.test | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/main/mysqld--defaults-file.test b/mysql-test/main/mysqld--defaults-file.test index 3bfe0aa891f..91d30eb1617 100644 --- a/mysql-test/main/mysqld--defaults-file.test +++ b/mysql-test/main/mysqld--defaults-file.test @@ -29,3 +29,19 @@ exec $MYSQLD --defaults-file=with.ext --print-defaults 2>&1; --error 1 exec $MYSQLD --defaults-file=no_extension --print-defaults 2>&1; +--echo # +--echo # MDEV-21374: When "--help --verbose" prints out configuration file paths, +--echo # the --defaults-file option is not considered +--echo # + +--echo # Test on `defaults-file` +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +exec $MYSQLD --defaults-file=$MYSQLTEST_VARDIR/my.cnf --help --verbose | grep -A 1 'Default options are read'; + +--echo # Test on `defaults-extra-file` +# <first-defaults> = `/etc/my.cnf /etc/mysql/my.cnf` +# Using sysconfdir configuration, we don't always have `/etc/mysql/my.cnf`, so replace them with a regex as well. +copy_file $MYSQLTEST_VARDIR/my.cnf $MYSQLTEST_VARDIR/my_test.cnf; +--replace_regex /.*my_test.cnf/<first-defaults> MYSQLTEST_VARDIR\/my_test.cnf/ +exec $MYSQLD --defaults-extra-file=$MYSQLTEST_VARDIR/my_test.cnf --help --verbose | grep -A 1 'Default options are read'; +remove_file $MYSQLTEST_VARDIR/my_test.cnf; |