From a84aa37830261f635925819ea9613046e13177e4 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 29 Sep 2009 21:02:48 +0200 Subject: Fix running test suite from installed directory rather than source directory. Fix trivial typo in BUILD/* scripts. BUILD/SETUP.sh: Fix typo. mysql-test/mysql-test-run.pl: Fix mysql-test-run.pl to be able to find plugins used in testing also when running the test suite from an installed mysqld package. --- BUILD/SETUP.sh | 2 +- mysql-test/mysql-test-run.pl | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 8892e1793f1..84abf2a461b 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -173,7 +173,7 @@ local_infile_configs="--enable-local-infile" max_no_embedded_configs="$SSL_LIBRARY --with-plugins=max" max_no_ndb_configs="$SSL_LIBRARY --with-plugins=max-no-ndb --with-embedded-server --with-libevent" -max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server -with-libevent" +max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server --with-libevent" # Disable NDB in maria max builds max_configs=$max_no_ndb_configs diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d80ea16e6a3..c73545bc568 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1886,7 +1886,8 @@ sub environment_setup { # -------------------------------------------------------------------------- my $lib_udf_example= mtr_file_exists(vs_config_dirs('sql', 'udf_example.dll'), - "$basedir/sql/.libs/udf_example.so",); + "$basedir/sql/.libs/udf_example.so", + "$basedir/lib/mysql/plugin/udf_example.so",); if ( $lib_udf_example ) { @@ -1913,7 +1914,8 @@ sub environment_setup { } my $lib_example_plugin= mtr_file_exists(vs_config_dirs('storage/example',$plugin_filename), - "$basedir/storage/example/.libs/".$plugin_filename); + "$basedir/storage/example/.libs/".$plugin_filename, + "$basedir/lib/mysql/plugin/".$plugin_filename); $ENV{'EXAMPLE_PLUGIN'}= ($lib_example_plugin ? basename($lib_example_plugin) : ""); $ENV{'EXAMPLE_PLUGIN_OPT'}= "--plugin-dir=". @@ -1928,7 +1930,8 @@ sub environment_setup { # ---------------------------------------------------- my $lib_simple_parser= mtr_file_exists(vs_config_dirs('plugin/fulltext', 'mypluglib.dll'), - "$basedir/plugin/fulltext/.libs/mypluglib.so",); + "$basedir/plugin/fulltext/.libs/mypluglib.so", + "$basedir/lib/mysql/plugin/mypluglib.so",); $ENV{'SIMPLE_PARSER'}= ($lib_simple_parser ? basename($lib_simple_parser) : ""); -- cgit v1.2.1