From 12fc3a9f38e44e1fa9571ce7a2bb95c86105f2a5 Mon Sep 17 00:00:00 2001
From: Jonathan Perkin <jonathan.perkin@oracle.com>
Date: Wed, 30 Jun 2010 12:19:54 +0100
Subject: bug#52737 plugin_dir is set to /usr/local/mysql/lib/plugin while     
      starting via mysqld_safe

Rather than hardcode the plugin directory, enhance mysql_config
to fix plugin path when running a relocated install, and use it
to provide the plugin directory to mysqld_safe.
---
 scripts/mysql_config.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'scripts/mysql_config.sh')

diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index d2699726a25..593d19fb91c 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -88,6 +88,8 @@ pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
 fix_path pkglibdir $pkglibdir_rel lib/mysql lib
 
 plugindir='@pkgplugindir@'
+plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
+fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
 
 pkgincludedir='@pkgincludedir@'
 fix_path pkgincludedir include/mysql include
-- 
cgit v1.2.1