diff options
| author | Mats Kindahl <mats@sun.com> | 2010-03-14 21:11:19 +0100 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2010-03-14 21:11:19 +0100 |
| commit | cba4c8d1dd487c315677cb0fd14a2e6dc659c86e (patch) | |
| tree | 939cf97d97e0004cdef67cfbf6f505f9b4bb86dd /scripts | |
| parent | 5c8d6c7473d2b7fad7dd9ded24e686450b7fbb8a (diff) | |
| download | mariadb-git-cba4c8d1dd487c315677cb0fd14a2e6dc659c86e.tar.gz | |
Bug #51938 plugin_dir gets bad default value
When building the script directory using a CMake-based build, both the
variables in config.h.cmake (including PLUGINDIR) and the variables in
CMakeList.txt (which includes pkgplugindir).
However, for autotools-based builds, only pkgplugindir is substituted,
which means that the plugin-path is not substituted.
This patch solves the problem by using pkgplugindir, which works on both
CMake-based and autotools-based builds, instead of PLUGINDIR.
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 a4ce5f9575b..5420ebd908e 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:-@PLUGINDIR@}${PLUGIN_VARIANT}" +plugin_dir="${PLUGIN_DIR:-@pkgplugindir@}${PLUGIN_VARIANT}" for i in "$ledir/$MYSQLD" "$defaults" "--basedir=$MY_BASEDIR_VERSION" \ "--datadir=$DATADIR" "--plugin-dir=$plugin_dir" "$USER_OPTION" |