Skip to content

Commit 395f23a

Browse files
committed
Remove unneded extra context line from test file to make it version independent
1 parent f21592c commit 395f23a

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

mysql-test/r/mysqld--defaults-file.result

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ Fatal error in defaults handling. Program aborted
1717
# Test on `defaults-file`
1818
Default options are read from the following files in the given order:
1919
MYSQLTEST_VARDIR/my.cnf
20-
The following groups are read: mysqld server mysqld-10.1 mariadb mariadb-10.1 client-server galera
2120
# Test on `defaults-extra-file`
2221
Default options are read from the following files in the given order:
2322
<first-defaults> MYSQLTEST_VARDIR/my_test.cnf ~/.my.cnf
24-
The following groups are read: mysqld server mysqld-10.1 mariadb mariadb-10.1 client-server galera

mysql-test/t/mysqld--defaults-file.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ exec $MYSQLD --defaults-file=no_extension --print-defaults 2>&1;
3636

3737
--echo # Test on `defaults-file`
3838
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
39-
exec $MYSQLD --defaults-file=$MYSQLTEST_VARDIR/my.cnf --help --verbose | grep -A 2 'Default options are read';
39+
exec $MYSQLD --defaults-file=$MYSQLTEST_VARDIR/my.cnf --help --verbose | grep -A 1 'Default options are read';
4040

4141
--echo # Test on `defaults-extra-file`
4242
# <first-defaults> = `/etc/my.cnf /etc/mysql/my.cnf`
4343
# Using sysconfdir configuration, we don't always have `/etc/mysql/my.cnf`, so replace them with a regex as well.
4444
copy_file $MYSQLTEST_VARDIR/my.cnf $MYSQLTEST_VARDIR/my_test.cnf;
4545
--replace_regex /.*my_test.cnf/<first-defaults> MYSQLTEST_VARDIR\/my_test.cnf/
46-
exec $MYSQLD --defaults-extra-file=$MYSQLTEST_VARDIR/my_test.cnf --help --verbose | grep -A 2 'Default options are read';
46+
exec $MYSQLD --defaults-extra-file=$MYSQLTEST_VARDIR/my_test.cnf --help --verbose | grep -A 1 'Default options are read';
4747
remove_file $MYSQLTEST_VARDIR/my_test.cnf;

0 commit comments

Comments
 (0)