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

Fix running test suite from installed directory rather than source directory.

Browse Source 
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.
This commit is contained in:
unknown
2009-09-29 21:02:48 +02:00
parent 12f18c8800
commit a84aa37830
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD/SETUP.sh
View File

@@ -173,7 +173,7 @@ local_infile_configs="--enable-local-infile"
max_no_embedded_configs="$SSL_LIBRARY --with-plugins=max" 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_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 # Disable NDB in maria max builds
max_configs=$max_no_ndb_configs max_configs=$max_no_ndb_configs

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

@@ -1886,7 +1886,8 @@ sub environment_setup {
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
my $lib_udf_example= my $lib_udf_example=
mtr_file_exists(vs_config_dirs('sql', 'udf_example.dll'), 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 ) if ( $lib_udf_example )
{ {
@@ -1913,7 +1914,8 @@ sub environment_setup {
} }
my $lib_example_plugin= my $lib_example_plugin=
mtr_file_exists(vs_config_dirs('storage/example',$plugin_filename), 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'}= $ENV{'EXAMPLE_PLUGIN'}=
($lib_example_plugin ? basename($lib_example_plugin) : ""); ($lib_example_plugin ? basename($lib_example_plugin) : "");
$ENV{'EXAMPLE_PLUGIN_OPT'}= "--plugin-dir=". $ENV{'EXAMPLE_PLUGIN_OPT'}= "--plugin-dir=".
@@ -1928,7 +1930,8 @@ sub environment_setup {
# ---------------------------------------------------- # ----------------------------------------------------
my $lib_simple_parser= my $lib_simple_parser=
mtr_file_exists(vs_config_dirs('plugin/fulltext', 'mypluglib.dll'), 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'}= $ENV{'SIMPLE_PARSER'}=
($lib_simple_parser ? basename($lib_simple_parser) : ""); ($lib_simple_parser ? basename($lib_simple_parser) : "");