database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merging the bug fixes for 34995 and 35543 (both of 5.0) up to 5.1,

Browse Source 
also the 5.0.62 build tag.
This commit is contained in:
Joerg Bruehe
2008-06-13 15:48:17 +02:00
parent 77e54c03ac 013d746de8
commit ec463b3dab
1 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,6 +112,7 @@ our $glob_basedir;
our $path_charsetsdir; our $path_charsetsdir;
our $path_client_bindir; our $path_client_bindir;
our $path_client_libdir;
our $path_share; our $path_share;
our $path_language; our $path_language;
our $path_timefile; our $path_timefile;
@@ -657,6 +658,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,
@@ -783,11 +786,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");
}
# Look for language files and charsetsdir, use same share # Look for language files and charsetsdir, use same share
$path_share= mtr_path_exists("$glob_basedir/share/mysql", $path_share= mtr_path_exists("$glob_basedir/share/mysql",
@@ -1837,10 +1848,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/",
@@ -1851,6 +1867,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
@@ -2091,6 +2108,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 )
{ {
@@ -5357,6 +5377,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