diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-02-23 16:51:58 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-02-23 16:51:58 +0200 |
| commit | d395d2514d872bc40374e900979825f81f992890 (patch) | |
| tree | 604317d3fde66b503527f0af0f71f559c9767927 /scripts/mysql_config.sh | |
| parent | 2b625ac3e0b2173df18c69df63af00dd03e8c672 (diff) | |
| download | mariadb-git-d395d2514d872bc40374e900979825f81f992890.tar.gz | |
Fixes for make_binary_distribution and mysql_config for OpenSuse 12.1
BUILD/SETUP.sh:
By default, build also with innodb-plugin
mysql-test/mysql-test-run.pl:
Also search in lib64 directory for plugins (This is used at least on OpenSuse 12.1 when using default build scripts)
mysql-test/r/lock_multi.result:
Allow test to be re-run even if it crashed.
mysql-test/t/lock_multi.test:
Allow test to be re-run even if it crashed.
scripts/make_binary_distribution.sh:
Ensure that libexecdir is named libexec (was not on OpenSuse 12.1)
scripts/mysql_config.sh:
Fixed detection of lib64 was used.
Diffstat (limited to 'scripts/mysql_config.sh')
| -rw-r--r-- | scripts/mysql_config.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index f1d46c0b2c0..ce61c09aa15 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -86,7 +86,7 @@ bindir='@bindir@' # If installed, search for the compiled in directory first (might be "lib64") pkglibdir='@pkglibdir@' pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"` -fix_path pkglibdir $pkglibdir_rel lib/mysql lib +fix_path pkglibdir $pkglibdir_rel lib64/mysql lib64 lib/mysql lib plugindir='@pkgplugindir@' |