mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.2' into 10.3

Browse source
This commit is contained in:
Oleksandr Byelkin 2020-03-06 23:28:26 +01:00
commit 440452628d
42 changed files with 545 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mysql-test/main/mysqld--defaults-file.result
View file

@ -10,3 +10,13 @@ Could not open required defaults file: MYSQL_TEST_DIR/with.ext
Fatal error in defaults handling. Program aborted
Could not open required defaults file: MYSQL_TEST_DIR/no_extension
Fatal error in defaults handling. Program aborted
#
# MDEV-21374: When "--help --verbose" prints out configuration file paths,
# the --defaults-file option is not considered
#
# Test on `defaults-file`
Default options are read from the following files in the given order:
MYSQLTEST_VARDIR/my.cnf
# Test on `defaults-extra-file`
Default options are read from the following files in the given order:
<first-defaults> MYSQLTEST_VARDIR/my_test.cnf ~/.my.cnf