diff -r 71199f3a4dcd -r 8e22d153c3d9 components/mysql-5-6/patches/bug23022999.patch
--- a/components/mysql-5-6/patches/bug23022999.patch	Sat Jun 25 10:48:59 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-Developed in-house, not fed back.
-Solaris-specific
-plugin_dir option not set correctly in mysqld_safe for 64bit mysql packages
---- a/scripts/mysqld_safe.sh
-+++ b/scripts/mysqld_safe.sh
-@@ -495,29 +495,6 @@ fi
- parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld`
- parse_arguments PICK-ARGS-FROM-ARGV "$@"
- 
--#
--# Try to find the plugin directory
--#
--
--# Use user-supplied argument
--if [ -n "${PLUGIN_DIR}" ]; then
--  plugin_dir="${PLUGIN_DIR}"
--else
--  # Try to find plugin dir relative to basedir
--  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}"
--      break
--    fi
--  done
--  # Give up and use compiled-in default
--  if [ -z "${plugin_dir}" ]; then
--    plugin_dir='@pkgplugindir@'
--  fi
--fi
--plugin_dir="${plugin_dir}${PLUGIN_VARIANT}"
--
- # Determine what logging facility to use
- 
- # Ensure that 'logger' exists, if it's requested
-@@ -760,7 +737,7 @@ fi
- cmd="`mysqld_ld_preload_text`$NOHUP_NICENESS"
- 
- for i in  "$ledir/$MYSQLD" "$defaults" "--basedir=$MY_BASEDIR_VERSION" \
--  "--datadir=$DATADIR" "--plugin-dir=$plugin_dir" "$USER_OPTION"
-+  "--datadir=$DATADIR" "${PLUGIN_DIR:+--plugin-dir="$PLUGIN_DIR"}" "$USER_OPTION"
- do
-   cmd="$cmd "`shell_quote_string "$i"`
- done