diff options
| author | Mats Kindahl <mats@sun.com> | 2010-05-11 15:55:52 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2010-05-11 15:55:52 +0200 |
| commit | 831f0b87e7d48cfaa7d6148593b06943ca873571 (patch) | |
| tree | 74f79b7d84e183aed2b29ba83dd83746e59162ad /scripts | |
| parent | ed2922b0f9a3b9e988b2aea45c74707c0bb7a6ec (diff) | |
| download | mariadb-git-831f0b87e7d48cfaa7d6148593b06943ca873571.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')
| -rw-r--r-- | scripts/mysqld_safe.sh | 2 |
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" |