database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge remote-tracking branch 'mysql/5.5' into 5.5

Browse Source
This commit is contained in:
Sergei Golubchik
2015-04-27 21:04:06 +02:00
parent e4df6e5799 e02fe87f00
commit 0f12ada6b6
28 changed files with 496 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/mysqld_safe.sh
View File

@ -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}"