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

Apply patch

Browse Source 
mysql-test/mysql-test-run.pl:
  Apply patch for bug#34995
This commit is contained in:
unknown 2008-03-03 12:53:57 +01:00
parent 020d99ee24
commit e32d6c83e6
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,6 +65,7 @@ our $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_current_testlog; our $path_current_testlog;
@ -358,6 +359,8 @@ sub command_line_setup {
'tmpdir=s' => \$opt_tmpdir, 'tmpdir=s' => \$opt_tmpdir,
'vardir=s' => \$opt_vardir, 'vardir=s' => \$opt_vardir,
'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,
@ -426,11 +429,19 @@ sub command_line_setup {
# #
# Look for the client binaries directory # Look for the client binaries directory
$path_client_bindir= mtr_path_exists("$basedir/client_release", if ($path_client_bindir)
"$basedir/client_debug", {
vs_config_dirs('client', ''), # --client-bindir=path set on command line, check that the path exists
"$basedir/client", $path_client_bindir= mtr_path_exists($path_client_bindir);
"$basedir/bin"); }
else
{
$path_client_bindir= mtr_path_exists("$basedir/client_release",
"$basedir/client_debug",
vs_config_dirs('client', ''),
"$basedir/client",
"$basedir/bin");
}
# Look for language files and charsetsdir, use same share # Look for language files and charsetsdir, use same share
my $path_share= mtr_path_exists("$basedir/share/mysql", my $path_share= mtr_path_exists("$basedir/share/mysql",
@ -1066,19 +1077,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, "$basedir/libmysql/.libs/", # Use the --client-libdir passed on commandline
"$basedir/libmysql_r/.libs/", push(@ld_library_paths, "$path_client_libdir");
"$basedir/zlib.libs/");
} }
else else
{ {
push(@ld_library_paths, "$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, "$basedir/libmysql/.libs/",
"$basedir/libmysql_r/.libs/",
"$basedir/zlib.libs/");
}
else
{
push(@ld_library_paths, "$basedir/lib");
}
} }
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
@ -3614,6 +3631,9 @@ Options to control directories to use
for tmpfs (/dev/shm) for tmpfs (/dev/shm)
The option can also be set using environment The option can also be set using environment
variable MTR_MEM=[DIR] variable MTR_MEM=[DIR]
client-bindir=PATH Path to the directory where client binaries are located
client-libdir=PATH Path to the directory where client libraries are located
Options to control what test suites or cases to run Options to control what test suites or cases to run