1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

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.
This commit is contained in:
Michael Widenius
2012-02-23 16:51:58 +02:00
parent 2b625ac3e0
commit d395d2514d
6 changed files with 11 additions and 4 deletions

View File

@ -285,7 +285,8 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then
pkgplugindir=@pkgplugindir@ \
pkgsuppdir=@pkgsuppdir@ \
mandir=@mandir@ \
infodir=@infodir@
infodir=@infodir@ \
libexecdir=@prefix@/libexec
# ----------------------------------------------------------------------
# Rename top directory, and set DEST to the new directory
@ -301,7 +302,10 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then
if [ -z "$gcclib" ] ; then
echo "Warning: Compiler doesn't tell libgcc.a!"
elif [ -f "$gcclib" ] ; then
{
mkdir -p $DEST/lib
$CP $gcclib $DEST/lib/libmygcc.a
}
else
echo "Warning: Compiler result '$gcclib' not found / no file!"
fi