1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto merge

Browse Source
This commit is contained in:
Georgi Kodinov 2008-06-17 11:42:17 +03:00
commit 22bd6d9de6
1 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 () {
'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 () {
# #
# Look for the client binaries directory # Look for the client binaries directory
$path_client_bindir= mtr_path_exists("$glob_basedir/client_release", if ($path_client_bindir)
"$glob_basedir/client_debug", {
vs_config_dirs('client', ''), # --client-bindir=path set on command line, check that the path exists
"$glob_basedir/client", $path_client_bindir= mtr_path_exists($path_client_bindir);
"$glob_basedir/bin"); }
else
{
$path_client_bindir= mtr_path_exists("$glob_basedir/client_release",
"$glob_basedir/client_debug",
vs_config_dirs('client', ''),
"$glob_basedir/client",
"$glob_basedir/bin");
}
if (!$opt_extern) if (!$opt_extern)
{ {
@ -1764,19 +1775,25 @@ sub environment_setup () {
my @ld_library_paths; my @ld_library_paths;
# -------------------------------------------------------------------------- if ($path_client_libdir)
# Setup LD_LIBRARY_PATH so the libraries from this distro/clone
# are used in favor of the system installed ones
# --------------------------------------------------------------------------
if ( $source_dist )
{ {
push(@ld_library_paths, "$glob_basedir/libmysql/.libs/", # Use the --client-libdir passed on commandline
"$glob_basedir/libmysql_r/.libs/", push(@ld_library_paths, "$path_client_libdir");
"$glob_basedir/zlib.libs/");
} }
else else
{ {
push(@ld_library_paths, "$glob_basedir/lib"); # Setup LD_LIBRARY_PATH so the libraries from this distro/clone
# are used in favor of the system installed ones
if ( $source_dist )
{
push(@ld_library_paths, "$glob_basedir/libmysql/.libs/",
"$glob_basedir/libmysql_r/.libs/",
"$glob_basedir/zlib.libs/");
}
else
{
push(@ld_library_paths, "$glob_basedir/lib");
}
} }
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
@ -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
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