From e5ec09e888ccc7657d326822b13f0bda14e287e6 Mon Sep 17 00:00:00 2001
From: "kent@mysql.com" <>
Date: Wed, 29 Mar 2006 14:07:13 +0200
Subject: [PATCH 1/2] Makefile.am:   Install "ndb_size.pl" script and template,
 bug#18421

---
 ndb/tools/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ndb/tools/Makefile.am b/ndb/tools/Makefile.am
index 795441380a8..4819f8ff289 100644
--- a/ndb/tools/Makefile.am
+++ b/ndb/tools/Makefile.am
@@ -1,4 +1,7 @@
 
+bin_SCRIPTS =		ndb_size.pl
+dist_pkgdata_DATA =	ndb_size.tmpl
+
 ndbtools_PROGRAMS = \
   ndb_test_platform \
   ndb_waiter \

From 67f2b0f3bc1a074609ee2f8470bf24dd926e73a7 Mon Sep 17 00:00:00 2001
From: "kent@mysql.com" <>
Date: Wed, 29 Mar 2006 14:59:53 +0200
Subject: [PATCH 2/2] mysql_config.sh:   If installed, search built in lib path
 first, bug#13158

---
 scripts/mysql_config.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index 4d732485b1d..84ff518c381 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -82,10 +82,15 @@ basedir=`echo $me | sed -e 's;/bin/mysql_config;;'`
 ldata='@localstatedir@'
 execdir='@libexecdir@'
 bindir='@bindir@'
+
+# If installed, search for the compiled in directory first (might be "lib64")
 pkglibdir='@pkglibdir@'
-fix_path pkglibdir lib/mysql lib
+pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
+fix_path pkglibdir $pkglibdir_rel lib/mysql lib
+
 pkgincludedir='@pkgincludedir@'
 fix_path pkgincludedir include/mysql include
+
 version='@VERSION@'
 socket='@MYSQL_UNIX_ADDR@'
 port='@MYSQL_TCP_PORT@'