diff options
| author | Mats Kindahl <mats@sun.com> | 2010-03-15 22:40:28 +0100 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2010-03-15 22:40:28 +0100 |
| commit | 13db463a8771103ae441fa5cdc1a13cdad792ad1 (patch) | |
| tree | 3b7da6d5c44537ae0223d8f018ba08489aeecd87 /scripts | |
| parent | 9e89385de52ff484848c6bb75f6735b42b0c91d2 (diff) | |
| parent | eef715c96000f8ebc1846d2a72e5a0a7abf88359 (diff) | |
| download | mariadb-git-13db463a8771103ae441fa5cdc1a13cdad792ad1.tar.gz | |
Merging with mysql-trunk-bugfixing
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" |