Commit 2d8acd2f authored by unknown's avatar unknown
Browse files

mysqld_safe.sh: 

  Added --help option, bug#16392
acinclude.m4:
  Use "$shrext_cmds" when testing if shared library exists, bug#16332


acinclude.m4:
  Use "$shrext_cmds" when testing if shared library exists, bug#16332
scripts/mysqld_safe.sh:
  Added --help option, bug#16392
parent 92df85b4

acinclude.m4

+6 −3
Original line number Diff line number Diff line
@@ -310,8 +310,9 @@ case $SYSTEM_TYPE in 
        fi

        ;;

      *)

        # Just to be safe, we test for ".so" anyway

        if test \( -f "$mysql_zlib_dir/lib/libz.a"  -o -f "$mysql_zlib_dir/lib/libz.so" -o \

                   -f "$mysql_zlib_dir/lib/libz.sl" -o -f "$mysql_zlib_dir/lib/libz.dylib" \) \

                   -f "$mysql_zlib_dir/lib/libz$shrext_cmds" \) \

                -a -f "$mysql_zlib_dir/include/zlib.h"; then

          ZLIB_INCLUDES="-I$mysql_zlib_dir/include"

          ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz"
@@ -976,7 +977,8 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ 
      for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \

/usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib \

/usr/freeware/lib32 /usr/local/lib/ ; do

      if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl.dylib ; then

      # Just to be safe, we test for ".so" anyway

      if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl$shrext_cmds ; then

        OPENSSL_LIB=$d

      fi

      done
@@ -988,7 +990,8 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ 
      if test -f $incs/openssl/ssl.h  ; then

        OPENSSL_INCLUDE=-I$incs

      fi

      if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl.dylib ; then

      # Just to be safe, we test for ".so" anyway

      if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl$shrext_cmds ; then

        OPENSSL_LIB=$libs

      fi

      ;;

scripts/mysqld_safe.sh

+28 −0
Original line number Diff line number Diff line
@@ -24,6 +24,31 @@ case "$1" in 
      ;;

esac



usage () {

        cat <<EOF

Usage: $0 [OPTIONS]

  --no-defaults              Don't read the system defaults file

  --defaults-file=FILE       Use the specified defaults file

  --defaults-extra-file=FILE Also use defaults from the specified file

  --ledir=DIRECTORY          Look for mysqld in the specified directory

  --err-log=FILE             Obsolete, use '--log-error'

  --log-error=FILE           Log errors to the specified log file

  --open-files=LIMIT         Obsolete, use '--open-files-limit'

  --open-files-limit=LIMIT   Limit the number of open files

  --core-file-size=LIMIT     Limit core files to the specified size

  --timezone=TZ              Set the system timezone

  --mysqld=FILE              Use the specified file as mysqld

  --mysqld-version=VERSION   Use "mysqld-VERSION" as mysqld

  --nice=NICE                Set the scheduling priority of mysqld

  --skip-kill-mysqld         Don't try to kill stray mysqld processes



All other options are passed to the mysqld program.



EOF

        exit 1

}





parse_arguments() {

  # We only need to pass arguments through to the server if we don't

  # handle them here.  So, we collect unrecognized options (passed on
@@ -72,6 +97,9 @@ parse_arguments() { 
	fi

	;;

      --nice=*) niceness=`echo "$arg" | sed -e "s;--nice=;;"` ;;

      --help)

        usage

        ;;

      *)

        if test -n "$pick_args"

        then