1 Developed in-house, not fed back.

     2 Solaris-specific

     3 plugin_dir option not set correctly in mysqld_safe for 64bit mysql packages

     4 --- a/scripts/mysqld_safe.sh

     5 +++ b/scripts/mysqld_safe.sh

     6 @@ -495,29 +495,6 @@ fi

     7  parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld`

     8  parse_arguments PICK-ARGS-FROM-ARGV "$@"

     9  

    10 -#

    11 -# Try to find the plugin directory

    12 -#

    13 -

    14 -# Use user-supplied argument

    15 -if [ -n "${PLUGIN_DIR}" ]; then

    16 -  plugin_dir="${PLUGIN_DIR}"

    17 -else

    18 -  # Try to find plugin dir relative to basedir

    19 -  for dir in lib64/mysql/plugin lib64/plugin lib/mysql/plugin lib/plugin

    20 -  do

    21 -    if [ -d "${MY_BASEDIR_VERSION}/${dir}" ]; then

    22 -      plugin_dir="${MY_BASEDIR_VERSION}/${dir}"

    23 -      break

    24 -    fi

    25 -  done

    26 -  # Give up and use compiled-in default

    27 -  if [ -z "${plugin_dir}" ]; then

    28 -    plugin_dir='@pkgplugindir@'

    29 -  fi

    30 -fi

    31 -plugin_dir="${plugin_dir}${PLUGIN_VARIANT}"

    32 -

    33  # Determine what logging facility to use

    34  

    35  # Ensure that 'logger' exists, if it's requested

    36 @@ -760,7 +737,7 @@ fi

    37  cmd="`mysqld_ld_preload_text`$NOHUP_NICENESS"

    38  

    39  for i in  "$ledir/$MYSQLD" "$defaults" "--basedir=$MY_BASEDIR_VERSION" \

    40 -  "--datadir=$DATADIR" "--plugin-dir=$plugin_dir" "$USER_OPTION"

    41 +  "--datadir=$DATADIR" "${PLUGIN_DIR:+--plugin-dir="$PLUGIN_DIR"}" "$USER_OPTION"

    42  do

    43    cmd="$cmd "`shell_quote_string "$i"`

    44  done