summaryrefslogtreecommitdiff
path: root/scripts/mysqld_safe.sh
diff options
context:
space:
mode:
authorMats Kindahl <mats@sun.com>2010-05-11 15:55:52 +0200
committerMats Kindahl <mats@sun.com>2010-05-11 15:55:52 +0200
commit6363f34ff902bc9d639fe4b2482145652588e3dc (patch)
tree74f79b7d84e183aed2b29ba83dd83746e59162ad /scripts/mysqld_safe.sh
parent6ac630ea30e702b8b88984059ea2e1432df0c07b (diff)
downloadmariadb-git-6363f34ff902bc9d639fe4b2482145652588e3dc.tar.gz
Bug #52737: plugin_dir is set to /usr/local/mysql/lib/plugin while starting
via mysqld_safe Plugin dir was set to a hard-coded path instead of relative the base dir. This patch fixes this by using a path relative the basedir instead of the plugin directory indicated by the configuration.
Diffstat (limited to 'scripts/mysqld_safe.sh')
-rw-r--r--scripts/mysqld_safe.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 5420ebd908e..59e7e8b7ef7 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -699,7 +699,7 @@ fi
cmd="`mysqld_ld_preload_text`$NOHUP_NICENESS"
-plugin_dir="${PLUGIN_DIR:-@pkgplugindir@}${PLUGIN_VARIANT}"
+plugin_dir="${PLUGIN_DIR:-$MY_BASEDIR_VERSION/lib/plugin}${PLUGIN_VARIANT}"
for i in "$ledir/$MYSQLD" "$defaults" "--basedir=$MY_BASEDIR_VERSION" \
"--datadir=$DATADIR" "--plugin-dir=$plugin_dir" "$USER_OPTION"