diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-04-27 21:04:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-27 21:04:06 +0200 |
| commit | 0f12ada6b6a390b8663151f5d8cfae2e6dc9c2bb (patch) | |
| tree | 5af5b81499f6137f45a37fc77cc518e40fd4ad72 /scripts | |
| parent | e4df6e5799eec20a16e279f7e74e95f18cd475fe (diff) | |
| parent | e02fe87f00dc9fdb0fb6ab13f2e87485f79f3341 (diff) | |
| download | mariadb-git-0f12ada6b6a390b8663151f5d8cfae2e6dc9c2bb.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into 5.5
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 303e7a29a6d..7f18abb3dc2 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -528,7 +528,7 @@ if [ -n "${PLUGIN_DIR}" ]; then plugin_dir="${PLUGIN_DIR}" else # Try to find plugin dir relative to basedir - for dir in lib/mysql/plugin lib/plugin + for dir in lib64/mysql/plugin lib64/plugin lib/mysql/plugin lib/plugin do if [ -d "${MY_BASEDIR_VERSION}/${dir}" ]; then plugin_dir="${MY_BASEDIR_VERSION}/${dir}" |