Merging with mysql-trunk-bugfixing

dc35b61f · Mats Kindahl · 74211ed9 · d21fa142 · dc35b61f
Commit dc35b61f authored Mar 15, 2010 by Mats Kindahl
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

scripts/mysqld_safe.sh scripts/mysqld_safe.sh +1 -1

No files found.
--- 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"