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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
22bd6d9d
Commit
22bd6d9d
authored
Jun 17, 2008
by
Georgi Kodinov
Browse files
Options
Browse Files
Download
Plain Diff
auto merge
parents
28d27983
889a669f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
14 deletions
+36
-14
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+36
-14
No files found.
mysql-test/mysql-test-run.pl
View file @
22bd6d9d
...
@@ -110,6 +110,7 @@ our $glob_basedir;
...
@@ -110,6 +110,7 @@ our $glob_basedir;
our
$path_charsetsdir
;
our
$path_charsetsdir
;
our
$path_client_bindir
;
our
$path_client_bindir
;
our
$path_client_libdir
;
our
$path_language
;
our
$path_language
;
our
$path_timefile
;
our
$path_timefile
;
our
$path_snapshot
;
our
$path_snapshot
;
...
@@ -623,6 +624,8 @@ sub command_line_setup () {
...
@@ -623,6 +624,8 @@ sub command_line_setup () {
'
vardir=s
'
=>
\
$opt_vardir
,
'
vardir=s
'
=>
\
$opt_vardir
,
'
benchdir=s
'
=>
\
$glob_mysql_bench_dir
,
'
benchdir=s
'
=>
\
$glob_mysql_bench_dir
,
'
mem
'
=>
\
$opt_mem
,
'
mem
'
=>
\
$opt_mem
,
'
client-bindir=s
'
=>
\
$path_client_bindir
,
'
client-libdir=s
'
=>
\
$path_client_libdir
,
# Misc
# Misc
'
report-features
'
=>
\
$opt_report_features
,
'
report-features
'
=>
\
$opt_report_features
,
...
@@ -717,11 +720,19 @@ sub command_line_setup () {
...
@@ -717,11 +720,19 @@ sub command_line_setup () {
#
#
# Look for the client binaries directory
# Look for the client binaries directory
if
(
$path_client_bindir
)
{
# --client-bindir=path set on command line, check that the path exists
$path_client_bindir
=
mtr_path_exists
(
$path_client_bindir
);
}
else
{
$path_client_bindir
=
mtr_path_exists
("
$glob_basedir
/client_release
",
$path_client_bindir
=
mtr_path_exists
("
$glob_basedir
/client_release
",
"
$glob_basedir
/client_debug
",
"
$glob_basedir
/client_debug
",
vs_config_dirs
('
client
',
''),
vs_config_dirs
('
client
',
''),
"
$glob_basedir
/client
",
"
$glob_basedir
/client
",
"
$glob_basedir
/bin
");
"
$glob_basedir
/bin
");
}
if
(
!
$opt_extern
)
if
(
!
$opt_extern
)
{
{
...
@@ -1764,10 +1775,15 @@ sub environment_setup () {
...
@@ -1764,10 +1775,15 @@ sub environment_setup () {
my
@ld_library_paths
;
my
@ld_library_paths
;
# --------------------------------------------------------------------------
if
(
$path_client_libdir
)
{
# Use the --client-libdir passed on commandline
push
(
@ld_library_paths
,
"
$path_client_libdir
");
}
else
{
# Setup LD_LIBRARY_PATH so the libraries from this distro/clone
# Setup LD_LIBRARY_PATH so the libraries from this distro/clone
# are used in favor of the system installed ones
# are used in favor of the system installed ones
# --------------------------------------------------------------------------
if
(
$source_dist
)
if
(
$source_dist
)
{
{
push
(
@ld_library_paths
,
"
$glob_basedir
/libmysql/.libs/
",
push
(
@ld_library_paths
,
"
$glob_basedir
/libmysql/.libs/
",
...
@@ -1778,6 +1794,7 @@ sub environment_setup () {
...
@@ -1778,6 +1794,7 @@ sub environment_setup () {
{
{
push
(
@ld_library_paths
,
"
$glob_basedir
/lib
");
push
(
@ld_library_paths
,
"
$glob_basedir
/lib
");
}
}
}
# --------------------------------------------------------------------------
# --------------------------------------------------------------------------
# Add the path where libndbclient can be found
# Add the path where libndbclient can be found
...
@@ -2028,6 +2045,9 @@ sub environment_setup () {
...
@@ -2028,6 +2045,9 @@ sub environment_setup () {
{
{
$cmdline_mysqlbinlog
.=
"
--character-sets-dir=
$path_charsetsdir
";
$cmdline_mysqlbinlog
.=
"
--character-sets-dir=
$path_charsetsdir
";
}
}
# Always use the given tmpdir for the LOAD files created
# by mysqlbinlog
$cmdline_mysqlbinlog
.=
"
--local-load=
$opt_tmpdir
";
if
(
$opt_debug
)
if
(
$opt_debug
)
{
{
...
@@ -5244,6 +5264,8 @@ Misc options
...
@@ -5244,6 +5264,8 @@ Misc options
warnings | log-warnings Pass --log-warnings to mysqld
warnings | log-warnings Pass --log-warnings to mysqld
sleep=SECONDS Passed to mysqltest, will be used as fixed sleep time
sleep=SECONDS Passed to mysqltest, will be used as fixed sleep time
client-bindir=PATH Path to the directory where client binaries are located
client-libdir=PATH Path to the directory where client libraries are located
Deprecated options
Deprecated options
with-openssl Deprecated option for ssl
with-openssl Deprecated option for ssl
...
...
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