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
422ba205
Commit
422ba205
authored
Mar 12, 2020
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mtr sets MYSQLTEST_REAL_VARDIR when MYSQLTEST_VARDIR is a symlink
this fixes main.mysqld--defaults-file failure with --mem
parent
fad47df9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
mysql-test/main/mysqld--defaults-file.test
mysql-test/main/mysqld--defaults-file.test
+1
-1
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+4
-2
No files found.
mysql-test/main/mysqld--defaults-file.test
View file @
422ba205
...
...
@@ -37,7 +37,7 @@ exec $MYSQLD --defaults-file=no_extension --print-defaults 2>&1;
--
echo
#
--
echo
# Test on `defaults-file`
--
replace_result
$MYSQLTEST_VARDIR
MYSQLTEST_VARDIR
--
replace_result
$MYSQLTEST_
REAL_
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`
...
...
mysql-test/mysql-test-run.pl
View file @
422ba205
...
...
@@ -79,7 +79,6 @@ BEGIN {
use
lib
"
lib
";
use
Cwd
;
use
Cwd
'
realpath
';
use
Getopt::
Long
;
use
My::File::
Path
;
# Patched version of File::Path
use
File::
Basename
;
...
...
@@ -104,6 +103,8 @@ use IO::Socket::INET;
use
IO::
Select
;
use
Time::
HiRes
qw(gettimeofday)
;
sub
realpath
($)
{
(
IS_WINDOWS
)
?
$_
[
0
]
:
Cwd::
realpath
(
$_
[
0
])
}
require
"
mtr_process.pl
";
require
"
mtr_io.pl
";
require
"
mtr_gprof.pl
";
...
...
@@ -1650,7 +1651,7 @@ sub command_line_setup {
my
$vardir_location
=
(
defined
$ENV
{
MTR_BINDIR
}
?
"
$ENV
{MTR_BINDIR}/mysql-test
"
:
$glob_mysql_test_dir
);
$vardir_location
=
realpath
$vardir_location
unless
IS_WINDOWS
;
$vardir_location
=
realpath
$vardir_location
;
$default_vardir
=
"
$vardir_location
/var
";
if
(
!
$opt_vardir
)
...
...
@@ -2454,6 +2455,7 @@ sub environment_setup {
$ENV
{'
DEFAULT_MASTER_PORT
'}
=
$mysqld_variables
{'
port
'};
$ENV
{'
MYSQL_TMP_DIR
'}
=
$opt_tmpdir
;
$ENV
{'
MYSQLTEST_VARDIR
'}
=
$opt_vardir
;
$ENV
{'
MYSQLTEST_REAL_VARDIR
'}
=
realpath
$opt_vardir
;
$ENV
{'
MYSQL_BINDIR
'}
=
$bindir
;
$ENV
{'
MYSQL_SHAREDIR
'}
=
$path_language
;
$ENV
{'
MYSQL_CHARSETSDIR
'}
=
$path_charsetsdir
;
...
...
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