summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJoerg Bruehe <joerg@mysql.com>2010-03-15 19:13:37 +0100
committerJoerg Bruehe <joerg@mysql.com>2010-03-15 19:13:37 +0100
commit0905a08a62c9a82af73ad92b741f6568d24fe8cb (patch)
treee019207c5e8d82b52b7f77c37e60d955e25869ca /scripts
parent8bb0186df0779ebc83439f58a22143a83dbfbfeb (diff)
downloadmariadb-git-0905a08a62c9a82af73ad92b741f6568d24fe8cb.tar.gz
Fix for bug#51938,
extracted from a work-in-progress development branch just for the build of 5.5.3-m3.
Diffstat (limited to 'scripts')
-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 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"