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
7695cab8
Commit
7695cab8
authored
Nov 23, 2006
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make source_dist a "local" global variable
And it's not an "opt"
parent
92930c12
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+6
-6
No files found.
mysql-test/mysql-test-run.pl
View file @
7695cab8
...
@@ -238,8 +238,6 @@ our $opt_suite_timeout;
...
@@ -238,8 +238,6 @@ our $opt_suite_timeout;
my
$default_testcase_timeout
=
15
;
# 15 min max
my
$default_testcase_timeout
=
15
;
# 15 min max
my
$default_suite_timeout
=
180
;
# 3 hours max
my
$default_suite_timeout
=
180
;
# 3 hours max
our
$opt_source_dist
;
our
$opt_start_and_exit
;
our
$opt_start_and_exit
;
our
$opt_start_dirty
;
our
$opt_start_dirty
;
our
$opt_start_from
;
our
$opt_start_from
;
...
@@ -299,6 +297,8 @@ our $glob_tot_real_time= 0;
...
@@ -299,6 +297,8 @@ our $glob_tot_real_time= 0;
our
%
mysqld_variables
;
our
%
mysqld_variables
;
my
$source_dist
=
0
;
######################################################################
######################################################################
#
#
...
@@ -627,7 +627,7 @@ sub command_line_setup () {
...
@@ -627,7 +627,7 @@ sub command_line_setup () {
if
(
-
d
"
../sql
"
)
if
(
-
d
"
../sql
"
)
{
{
$
opt_
source_dist
=
1
;
$source_dist
=
1
;
}
}
$glob_hostname
=
mtr_short_hostname
();
$glob_hostname
=
mtr_short_hostname
();
...
@@ -647,7 +647,7 @@ sub command_line_setup () {
...
@@ -647,7 +647,7 @@ sub command_line_setup () {
unless
defined
$glob_mysql_bench_dir
;
unless
defined
$glob_mysql_bench_dir
;
$path_my_basedir
=
$path_my_basedir
=
$
opt_
source_dist
?
$glob_mysql_test_dir
:
$glob_basedir
;
$source_dist
?
$glob_mysql_test_dir
:
$glob_basedir
;
$glob_timers
=
mtr_init_timers
();
$glob_timers
=
mtr_init_timers
();
...
@@ -901,7 +901,7 @@ sub command_line_setup () {
...
@@ -901,7 +901,7 @@ sub command_line_setup () {
# --------------------------------------------------------------------------
# --------------------------------------------------------------------------
# Gcov flag
# Gcov flag
# --------------------------------------------------------------------------
# --------------------------------------------------------------------------
if
(
$opt_gcov
and
!
$
opt_
source_dist
)
if
(
$opt_gcov
and
!
$source_dist
)
{
{
mtr_error
("
Coverage test needs the source - please use source dist
");
mtr_error
("
Coverage test needs the source - please use source dist
");
}
}
...
@@ -1526,7 +1526,7 @@ sub environment_setup () {
...
@@ -1526,7 +1526,7 @@ sub environment_setup () {
# 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
(
$
opt_
source_dist
)
if
(
$source_dist
)
{
{
push
(
@ld_library_paths
,
"
$glob_basedir
/libmysql/.libs/
",
push
(
@ld_library_paths
,
"
$glob_basedir
/libmysql/.libs/
",
"
$glob_basedir
/libmysql_r/.libs/
");
"
$glob_basedir
/libmysql_r/.libs/
");
...
...
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