summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMats Kindahl <mats@sun.com>2010-03-15 22:40:28 +0100
committerMats Kindahl <mats@sun.com>2010-03-15 22:40:28 +0100
commitc4276d3ff6d92dfc721cf9305ebbf6191a5ceff3 (patch)
tree3b7da6d5c44537ae0223d8f018ba08489aeecd87 /scripts
parenta45162d4e33152255132ec642ba7cfc60b5df1e1 (diff)
parentcba4c8d1dd487c315677cb0fd14a2e6dc659c86e (diff)
downloadmariadb-git-c4276d3ff6d92dfc721cf9305ebbf6191a5ceff3.tar.gz
Merging with mysql-trunk-bugfixing
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"