Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
395f23a1
Commit
395f23a1
authored
Feb 28, 2020
by
Vicențiu Ciorbaru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unneded extra context line from test file to make it version independent
parent
f21592c6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
mysql-test/r/mysqld--defaults-file.result
mysql-test/r/mysqld--defaults-file.result
+0
-2
mysql-test/t/mysqld--defaults-file.test
mysql-test/t/mysqld--defaults-file.test
+2
-2
No files found.
mysql-test/r/mysqld--defaults-file.result
View file @
395f23a1
...
...
@@ -17,8 +17,6 @@ Fatal error in defaults handling. Program aborted
# Test on `defaults-file`
Default options are read from the following files in the given order:
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`
Default options are read from the following files in the given order:
<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
mysql-test/t/mysqld--defaults-file.test
View file @
395f23a1
...
...
@@ -36,12 +36,12 @@ exec $MYSQLD --defaults-file=no_extension --print-defaults 2>&1;
--
echo
# Test on `defaults-file`
--
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`
# <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
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
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment