From: Jonathan Perkin
Date: July 5 2010 9:20pm
Subject: bzr commit into mysql-trunk branch (jonathan.perkin:3099)
List-Archive: http://lists.mysql.com/commits/112920
Message-Id: <201007052122.o65LM8nK007567@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0729167069=="

--===============0729167069==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/jonathan/bzr2/mysql-5.5.5-m3-release/ based on revid:jonathan.perkin@stripped

 3099 Jonathan Perkin	2010-07-05
      We can't rely on mysql_config for core functionality like plugins
      as it may be part of a separate package.
      
      Work out the likliest plugin directory using similar logic to the
      data directory, and avoid the dependancy.

    modified:
      scripts/mysqld_safe.sh
=== modified file 'scripts/mysqld_safe.sh'
--- a/scripts/mysqld_safe.sh	2010-06-30 11:19:54 +0000
+++ b/scripts/mysqld_safe.sh	2010-07-05 21:19:14 +0000
@@ -413,6 +413,29 @@ else
   DATADIR=@localstatedir@
 fi
 
+#
+# Try to find the plugin directory
+#
+
+# Use user-supplied argument
+if [ -n "${PLUGIN_DIR}" ]; then
+  plugin_dir="${PLUGIN_DIR}"
+else
+  # Try to find plugin dir relative to basedir
+  for dir in lib/mysql/plugin lib/plugin
+  do
+    if [ -d "${MY_BASEDIR_VERSION}/${dir}" ]; then
+      plugin_dir="${MY_BASEDIR_VERSION}/${dir}"
+      break
+    fi
+  done
+  # Give up and use compiled-in default
+  if [ -z "${plugin_dir}" ]; then
+    plugin_dir='@pkgplugindir@'
+  fi
+fi
+plugin_dir="${plugin_dir}${PLUGIN_VARIANT}"
+
 if test -z "$MYSQL_HOME"
 then 
   if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
@@ -704,8 +727,6 @@ fi
 
 cmd="`mysqld_ld_preload_text`$NOHUP_NICENESS"
 
-plugin_dir="${PLUGIN_DIR:-`get_mysql_config --variable=plugindir`}${PLUGIN_VARIANT}"
-
 for i in  "$ledir/$MYSQLD" "$defaults" "--basedir=$MY_BASEDIR_VERSION" \
   "--datadir=$DATADIR" "--plugin-dir=$plugin_dir" "$USER_OPTION"
 do


--===============0729167069==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jonathan.perkin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonathan.perkin@stripped\
#   3rv94ey0n8xf1g5q
# target_branch: file:///Users/jonathan/bzr2/mysql-5.5.5-m3-release/
# testament_sha1: 7c922288e36f889c5872311e2db519fef43fe570
# timestamp: 2010-07-05 22:20:20 +0100
# base_revision_id: jonathan.perkin@stripped\
#   18t72i19rb5or55b
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeXaHxoAAd7fgFAQXOf//3a3
36q////6UATbTe4BtZ73aa9zLw4SSmQJqZlPRpPTRPJTYU8mkNNlAaAaBmpoCSQQMTRNBTzVNQ9p
T1DxR5NE9JoNA0ANAaEajI1J6mymaZCZBoAAAZA00MjQDFCTyao8hNqep6mT1D9SAAAAAAAASSET
U9T0mTID0agaYjIANA0BoGEyMINWE15x5fLMKq/RfaB+IP1o9/lunXoszjDWbM5k0yFi3NNz52X1
gPj1ckk9C/PZ74GP3qnu+RmZWyKQtfTWBWrrIuV1ozLMUCPFonF+7cF6REQs1smxD4ZhcrHvvyCK
JtLZkV6xKbjieisUQlQQcp8ZOlFSNNn8VJliz6at3R06xmDJzC0DhikL3WQHCLJHdRuU5xEbBcbp
HS2V64ZerSQ39+6UqITylOCRTSG0jZJISRTmrPGlQ2uOEXewRUHmjBFBlDJDIHxHqKYzi/EV+BFl
braC8utxU29r8hUhG2PVptxFJew7L6mhycV7+C1b1rQUWcbU4phODxxbIXdcIeLLfC3hoXMxu5LH
iWPas5medwPdwNl65EOmdDjM1M8OcOOdtDQ4CnsFcTGTlU2j9Ha7q2WlMZPc14xh81gnRgamOW1d
DnCnMtwjQLMqrLoDZcSKyN+ah1PR3C425sx5rnUywi4e8frOtVDCLXKoyDNHxqK3WSwwTtvvHj5y
pvg5Y627EQk2vwHCcF1CwleOdBLf5+0T8hiPm31MYKtiduuGk6E37mi5GJxHG5NG0Q8Io24rcWWr
LfmqrcxDp3WuiSN/y78hewMmMx6ph/6RmRVseJRGIOLGtB9VVkGHqWFQgDjTHnh3qDlU1PgPF4ka
kNlaV3Ml2dud6vanh50dfdpp95oSKfZ31TmgEMvrbLHxZIs2bDTxxE9uOlOwuvoCfh5YP7L8hvQe
HfOaPRDBjVzKhx/fz6IxpuJb+BKlInrP94SwSaESOYkXoaithiK6QxiUUGWVip+ULohAzG0MaY0b
2wwnZvPGo0aoD0LiYZpUdjLHKMb57v6iT4E27KPxiOSRI1NG7tMbOxxZ+jXS8ngmmB5PQ9lizOot
t53U0tfhNVfc7XVfuwXg/JZfMq2jCUbz0rLG8kADmTpQAuHRBa43Yl/hcmU5TzNi2vIB5KeGnHZ4
wOTmDbqGgjfOKW8KjchWXrTmsWgYMgLqYKGXdUsKdOmtrm1GuCrDr6U0TzuwrviZRgQthwtTOuQY
TDYRAwUYQBJYk/MFKqBJROksock9EXxkdEdEwfU3jQYIijyXUbYIW0XGm+WSAswQotG8GsEzgfE6
YenuSGHttEtlxVOUjs24rZB805BbSCJX2IwyIWUnPfM4MWF9QxVCgRVDBFAxYkSFtAppACE6ALqE
HBIB6cUHpoKRRqxykCmbFnhyIT5Uf38JEPlilJixftIvhD6YVmeLDgqzXJxVzwMmwEI/gkSOwTWy
JvVBn6eBsfHQT2bzsrFjKhZS5gCkFWA0sIRJndSN8udMbuNPIpwNDY6tsWgGTF0R3cy62zyEx/ww
VDxswk0sjc0p8fdeZv06Vc4wjHEHzXX29LeoVVgEmrsrPr2frlZ7Fa7wHWM7PQlAE5JuEqGsIheD
8GGWtrlU3eBNC5y6XTmMseelBTKLo4BtKPyjDM3CaBau45ywbhtcje1ouJy7Rdb757CklIl0ILU3
kwzYT/F3JFOFCQ5dofGg


--===============0729167069==--