database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
msvensson@neptunus.(none)
2006-11-23 18:19:54 +01:00
parent 8f85eaf925 cdbc79b500
commit 8c2efdf4bd
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/mysql-test-run.pl
View File

@ -240,8 +240,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;
@ -301,6 +299,8 @@ our $glob_tot_real_time= 0;
our %mysqld_variables; our %mysqld_variables;
my $source_dist= 0;
###################################################################### ######################################################################
# #
@ -634,7 +634,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();
@ -670,7 +670,7 @@ sub command_line_setup () {
unless -d $glob_mysql_bench_dir; unless -d $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();
@ -933,7 +933,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");
} }
@ -1598,7 +1598,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/");