database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Remove unneded extra context line from test file to make it version independent

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2020-02-28 19:54:08 +02:00
parent f21592c675
commit 395f23a10d
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/mysqld--defaults-file.result
View File

@ -17,8 +17,6 @@ Fatal error in defaults handling. Program aborted
# Test on `defaults-file` # Test on `defaults-file`
Default options are read from the following files in the given order: Default options are read from the following files in the given order:
MYSQLTEST_VARDIR/my.cnf MYSQLTEST_VARDIR/my.cnf
The following groups are read: mysqld server mysqld-10.1 mariadb mariadb-10.1 client-server galera
# Test on `defaults-extra-file` # Test on `defaults-extra-file`
Default options are read from the following files in the given order: Default options are read from the following files in the given order:
<first-defaults> MYSQLTEST_VARDIR/my_test.cnf ~/.my.cnf <first-defaults> MYSQLTEST_VARDIR/my_test.cnf ~/.my.cnf
The following groups are read: mysqld server mysqld-10.1 mariadb mariadb-10.1 client-server galera

4
mysql-test/t/mysqld--defaults-file.test
View File

@ -36,12 +36,12 @@ exec $MYSQLD --defaults-file=no_extension --print-defaults 2>&1;
--echo # Test on `defaults-file` --echo # Test on `defaults-file`
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
exec $MYSQLD --defaults-file=$MYSQLTEST_VARDIR/my.cnf --help --verbose | grep -A 2 'Default options are read'; exec $MYSQLD --defaults-file=$MYSQLTEST_VARDIR/my.cnf --help --verbose | grep -A 1 'Default options are read';
--echo # Test on `defaults-extra-file` --echo # Test on `defaults-extra-file`
# <first-defaults> = `/etc/my.cnf /etc/mysql/my.cnf` # <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. # 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; copy_file $MYSQLTEST_VARDIR/my.cnf $MYSQLTEST_VARDIR/my_test.cnf;
--replace_regex /.*my_test.cnf/<first-defaults> 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 2 'Default options are read'; 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; remove_file $MYSQLTEST_VARDIR/my_test.cnf;