summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2015-05-04 13:50:52 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2015-05-04 13:50:52 -0400
commitd2562004c5ac118b399475195b08f17fe673e481 (patch)
tree51e261ceee484919e6b5a72eaf1f8535e83ab90c /scripts
parent42f99d00eee0023184c6d985fa6f4e7a9717c3d8 (diff)
parent4c87f727734955f9e4a0ffde25aae4d43ec0b2a5 (diff)
downloadmariadb-git-d2562004c5ac118b399475195b08f17fe673e481.tar.gz
Merge tag 'mariadb-5.5.43' into 5.5-galera
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 1de9e401186..48c766238d4 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -619,7 +619,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}"