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

Return empty string if file does not exist

Browse Source 
Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example
This commit is contained in:
msvensson@shellback.(none)
2006-04-27 21:26:24 +02:00
parent e5004d1312
commit 6aa775f348
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/lib/mtr_misc.pl
View File

@ -100,14 +100,7 @@ sub mtr_file_exists (@) {
{
return $path if -e $path;
}
if ( @_ == 1 )
{
mtr_error("Could not find $_[0]");
}
else
{
mtr_error("Could not find any of " . join(" ", @_));
}
return "";
}
sub mtr_exe_exists (@) {

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

@ -1150,7 +1150,7 @@ sub environment_setup () {
# Add the path where mysqld will find udf_example.so
# --------------------------------------------------------------------------
$ENV{'LD_LIBRARY_PATH'}=
"$glob_basedir/sql/.libs" .
($lib_udf_example ? dirname($lib_udf_example) : "") .
($ENV{'LD_LIBRARY_PATH'} ? ":$ENV{'LD_LIBRARY_PATH'}" : "");
@ -2956,7 +2956,8 @@ sub run_mysqltest ($) {
$ENV{'MYSQL_CLIENT_TEST'}= $cmdline_mysql_client_test;
$ENV{'CHARSETSDIR'}= $path_charsetsdir;
$ENV{'MYSQL_MY_PRINT_DEFAULTS'}= $exe_my_print_defaults;
$ENV{'UDF_EXAMPLE_LIB'}= basename($lib_udf_example);
$ENV{'UDF_EXAMPLE_LIB'}=
($lib_udf_example ? basename($lib_udf_example) : "");
$ENV{'NDB_MGM'}= $exe_ndb_mgm;
$ENV{'NDB_BACKUP_DIR'}= $path_ndb_data_dir;