From d395d2514d872bc40374e900979825f81f992890 Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@askmonty.org>
Date: Thu, 23 Feb 2012 16:51:58 +0200
Subject: [PATCH] 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.
---
 BUILD/SETUP.sh                      | 2 +-
 mysql-test/mysql-test-run.pl        | 3 ++-
 mysql-test/r/lock_multi.result      | 1 +
 mysql-test/t/lock_multi.test        | 1 +
 scripts/make_binary_distribution.sh | 6 +++++-
 scripts/mysql_config.sh             | 2 +-
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index c254304a5a8..c1a05fb1007 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -178,7 +178,7 @@ base_configs="--prefix=$prefix --enable-assembler "
 base_configs="$base_configs --with-extra-charsets=complex "
 base_configs="$base_configs --enable-thread-safe-client "
 base_configs="$base_configs --with-big-tables"
-base_configs="$base_configs --with-plugin-aria --with-aria-tmp-tables --without-plugin-innodb_plugin"
+base_configs="$base_configs --with-plugin-aria --with-aria-tmp-tables"
 # Compile our client programs with static libraries to allow them to be moved
 base_configs="$base_configs --with-mysqld-ldflags=-static --with-client-ldflags=-static"
 
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 4d6269044c1..e6ef03d6ad5 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2518,7 +2518,8 @@ sub setup_vardir() {
   else
   {
     # hm, what paths work for debs and for rpms ?
-    for (<$bindir/lib/mysql/plugin/*.so>,
+    for (<$bindir/lib64/mysql/plugin/*.so>,
+         <$bindir/lib/mysql/plugin/*.so>,
          <$bindir/lib/plugin/*.dll>)
     {
       my $pname=basename($_);
diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result
index 3fc4de3da06..72f4b22b06a 100644
--- a/mysql-test/r/lock_multi.result
+++ b/mysql-test/r/lock_multi.result
@@ -1,4 +1,5 @@
 drop table if exists t1,t2;
+drop DATABASE if exists mysqltest_1;
 create table t1(n int);
 insert into t1 values (1);
 lock tables t1 write;
diff --git a/mysql-test/t/lock_multi.test b/mysql-test/t/lock_multi.test
index f05821af5a8..044af931489 100644
--- a/mysql-test/t/lock_multi.test
+++ b/mysql-test/t/lock_multi.test
@@ -5,6 +5,7 @@
 
 --disable_warnings
 drop table if exists t1,t2;
+drop DATABASE if exists mysqltest_1;
 --enable_warnings
 
 # Test to see if select will get the lock ahead of low priority update
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 789f3e3ce2e..070b396a34c 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -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
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@'