diff options
| author | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-06-30 12:19:54 +0100 |
|---|---|---|
| committer | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-06-30 12:19:54 +0100 |
| commit | 12fc3a9f38e44e1fa9571ce7a2bb95c86105f2a5 (patch) | |
| tree | 4773aae8b4a5240510f9d4eb5e00fad8477115b0 /scripts/mysqld_safe.sh | |
| parent | c49335e8a7a980c7838322cd86c5c86c42a76d0b (diff) | |
| download | mariadb-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/mysqld_safe.sh')
| -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 562732e7387..d96091b685a 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -704,7 +704,7 @@ fi cmd="`mysqld_ld_preload_text`$NOHUP_NICENESS" -plugin_dir="${PLUGIN_DIR:-$MY_BASEDIR_VERSION/lib/mysql/plugin}${PLUGIN_VARIANT}" +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" |