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
e789fb75
Commit
e789fb75
authored
Feb 06, 2012
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move --secure-file-priv from hardcoded to a template. remove redundant suite.opt
parent
aadc6d7f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
11 deletions
+2
-11
mysql-test/README.suites
mysql-test/README.suites
+1
-0
mysql-test/include/default_mysqld.cnf
mysql-test/include/default_mysqld.cnf
+1
-0
mysql-test/lib/My/ConfigFactory.pm
mysql-test/lib/My/ConfigFactory.pm
+0
-9
mysql-test/suite/funcs_1/t/suite.opt
mysql-test/suite/funcs_1/t/suite.opt
+0
-2
No files found.
mysql-test/README.suites
View file @
e789fb75
...
...
@@ -124,6 +124,7 @@ and values - with templating extensions. They are
to
values
in
the
[
ENV
]
group
of
my
.
cnf
file
.
Via
the
OPT
group
one
can
refer
to
special
values
:
@
OPT
.
plugindir
-
a
path
to
plugindir
@
OPT
.
vardir
-
a
path
to
vardir
@
OPT
.
port
-
a
new
port
number
is
reserved
out
of
the
pool
.
It
will
not
match
any
other
port
number
used
by
this
test
run
.
...
...
mysql-test/include/default_mysqld.cnf
View file @
e789fb75
...
...
@@ -24,6 +24,7 @@ character-set-server= latin1
connect-timeout= 60
plugin-dir=@OPT.plugindir
secure-file-priv= @OPT.vardir
log-basename=mysqld
debug-no-sync
...
...
mysql-test/lib/My/ConfigFactory.pm
View file @
e789fb75
...
...
@@ -165,13 +165,6 @@ sub fix_log_slow_queries {
return
"
$dir
/mysqld-slow.log
";
}
sub
fix_secure_file_priv
{
my
(
$self
)
=
@_
;
my
$vardir
=
$self
->
{
ARGS
}
->
{
vardir
};
# By default, prevent the started mysqld to access files outside of vardir
return
$vardir
;
}
sub
fix_std_data
{
my
(
$self
,
$config
,
$group_name
,
$group
)
=
@_
;
my
$testdir
=
$self
->
get_testdir
(
$group
);
...
...
@@ -244,8 +237,6 @@ my @mysqld_rules=
{
'
#user
'
=>
sub
{
return
shift
->
{
ARGS
}
->
{
user
}
||
"";
}
},
{
'
#password
'
=>
sub
{
return
shift
->
{
ARGS
}
->
{
password
}
||
"";
}
},
{
'
server-id
'
=>
\&
fix_server_id
,
},
# By default, prevent the started mysqld to access files outside of vardir
{
'
secure-file-priv
'
=>
sub
{
return
shift
->
{
ARGS
}
->
{
vardir
};
}
},
{
'
ssl-ca
'
=>
\&
fix_ssl_ca
},
{
'
ssl-cert
'
=>
\&
fix_ssl_server_cert
},
{
'
ssl-key
'
=>
\&
fix_ssl_server_key
},
...
...
mysql-test/suite/funcs_1/t/suite.opt
deleted
100644 → 0
View file @
aadc6d7f
--secure-file-priv=$MYSQLTEST_VARDIR
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