author | Gipson Pulla <gipson.pulla@oracle.com> |
Fri, 29 Apr 2016 09:42:35 -0700 | |
changeset 5884 | ef644c2bdc65 |
permissions | -rw-r--r-- |
5884
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
1 |
Developed in-house, not fed back. |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
2 |
Solaris-specific |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
3 |
plugin_dir option not set correctly in mysqld_safe for 64bit mysql packages |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
4 |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
5 |
--- a/scripts/mysqld_safe.sh |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
6 |
+++ b/scripts/mysqld_safe.sh |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
7 |
@@ -492,29 +492,6 @@ case "$timestamp_format" in |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
8 |
log_error "unknown data format $timestamp_format, using UTC";; |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
9 |
esac |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
10 |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
11 |
-# |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
12 |
-# Try to find the plugin directory |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
13 |
-# |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
14 |
- |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
15 |
-# Use user-supplied argument |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
16 |
-if [ -n "${PLUGIN_DIR}" ]; then |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
17 |
- plugin_dir="${PLUGIN_DIR}" |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
18 |
-else |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
19 |
- # Try to find plugin dir relative to basedir |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
20 |
- for dir in lib64/mysql/plugin lib64/plugin lib/mysql/plugin lib/plugin |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
21 |
- do |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
22 |
- if [ -d "${MY_BASEDIR_VERSION}/${dir}" ]; then |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
23 |
- plugin_dir="${MY_BASEDIR_VERSION}/${dir}" |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
24 |
- break |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
25 |
- fi |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
26 |
- done |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
27 |
- # Give up and use compiled-in default |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
28 |
- if [ -z "${plugin_dir}" ]; then |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
29 |
- plugin_dir='@pkgplugindir@' |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
30 |
- fi |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
31 |
-fi |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
32 |
-plugin_dir="${plugin_dir}${PLUGIN_VARIANT}" |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
33 |
- |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
34 |
# A pid file is created for the mysqld_safe process. This file protects the |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
35 |
# server instance resources during race conditions. |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
36 |
safe_pid="$DATADIR/mysqld_safe.pid" |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
37 |
@@ -789,7 +766,7 @@ fi |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
38 |
cmd="`mysqld_ld_preload_text`$NOHUP_NICENESS" |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
39 |
|
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
40 |
for i in "$ledir/$MYSQLD" "$defaults" "--basedir=$MY_BASEDIR_VERSION" \ |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
41 |
- "--datadir=$DATADIR" "--plugin-dir=$plugin_dir" "$USER_OPTION" |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
42 |
+ "--datadir=$DATADIR" "${PLUGIN_DIR:+--plugin-dir="$PLUGIN_DIR"}" "$USER_OPTION" |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
43 |
do |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
44 |
cmd="$cmd "`shell_quote_string "$i"` |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
45 |
done |
ef644c2bdc65
22112750 Add MySQL 5.7 to Solaris
Gipson Pulla <gipson.pulla@oracle.com>
parents:
diff
changeset
|
46 |