mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Add test to mysql-test-run.pl to see if the udf_example.so is availble. Set envioronment variable UDF_EXAMPLE_LIB if it is.
Then check in have_udf if that variable is set. Finally use tahe variable when loading the shared library. mysql-test/include/have_udf.inc: Add check if udf_example.so(or similar) is available mysql-test/lib/mtr_misc.pl: Add funcion "mtr_file_exist" to search for files mysql-test/mysql-test-run.pl: Add checks to find the udf_example.so library mysql-test/r/udf.result: Update result mysql-test/t/disabled.def: Remove udf.test from disabled tests mysql-test/t/udf.test: Use variable UDF_EXAMPLE_LIB when looking for shared library to load mysql-test/r/have_udf_example.require: New BitKeeper file ``mysql-test/r/have_udf_example.require''
This commit is contained in:
@@ -188,6 +188,7 @@ our $exe_mysqltest;
|
||||
our $exe_slave_mysqld;
|
||||
our $exe_im;
|
||||
our $exe_my_print_defaults;
|
||||
our $lib_udf_example;
|
||||
|
||||
our $opt_bench= 0;
|
||||
our $opt_small_bench= 0;
|
||||
@@ -1057,6 +1058,8 @@ sub executable_setup () {
|
||||
mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables");
|
||||
$path_ndb_tools_dir= mtr_path_exists("$glob_basedir/ndb/tools");
|
||||
$exe_ndb_mgm= "$glob_basedir/ndb/src/mgmclient/ndb_mgm";
|
||||
$lib_udf_example=
|
||||
mtr_file_exists("$glob_basedir/sql/.libs/udf_example.so");
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2936,6 +2939,7 @@ 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{'NDB_MGM'}= $exe_ndb_mgm;
|
||||
$ENV{'NDB_BACKUP_DIR'}= $path_ndb_data_dir;
|
||||
|
Reference in New Issue
Block a user