summaryrefslogtreecommitdiff
path: root/scripts/mysql_config.sh
diff options
context:
space:
mode:
authorJonathan Perkin <jonathan.perkin@oracle.com>2010-06-30 12:19:54 +0100
committerJonathan Perkin <jonathan.perkin@oracle.com>2010-06-30 12:19:54 +0100
commit12fc3a9f38e44e1fa9571ce7a2bb95c86105f2a5 (patch)
tree4773aae8b4a5240510f9d4eb5e00fad8477115b0 /scripts/mysql_config.sh
parentc49335e8a7a980c7838322cd86c5c86c42a76d0b (diff)
downloadmariadb-git-12fc3a9f38e44e1fa9571ce7a2bb95c86105f2a5.tar.gz
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.
Diffstat (limited to 'scripts/mysql_config.sh')
-rw-r--r--scripts/mysql_config.sh2
1 files changed, 2 insertions, 0 deletions
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