1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Added support for --crash-script in mysqld_safe.

Trivial cleanup

scripts/mysqld_safe.sh:
  Added support for --crash-script.
  Don't remove socket file (not needed as server will re-create it if needed)
  Patch by Eric Bergen
storage/maria/ha_maria.h:
  Removed not existing variable.
This commit is contained in:
Michael Widenius
2013-02-28 08:42:05 +02:00
parent 2c97d5a305
commit 2d78ef1d3b
2 changed files with 8 additions and 2 deletions

View File

@ -71,6 +71,7 @@ Usage: $0 [OPTIONS]
--defaults-extra-file=FILE Also use defaults from the specified file
--ledir=DIRECTORY Look for mysqld in the specified directory
--open-files-limit=LIMIT Limit the number of open files
--crash-script=FILE Script to call when mysqld crashes
--timezone=TZ Set the system timezone
--malloc-lib=LIB Preload shared library LIB if available
--mysqld=FILE Use the specified file as mysqld
@ -202,6 +203,7 @@ parse_arguments() {
optname_subst=`echo "$optname" | sed 's/_/-/g'`
arg=`echo $arg | sed "s/^$optname/$optname_subst/"`
case "$arg" in
--crash-script=*) CRASH_SCRIPT="$val" ;;
# these get passed explicitly to mysqld
--basedir=*) MY_BASEDIR_VERSION="$val" ;;
--datadir=*|--data=*) DATADIR="$val" ;;
@ -799,7 +801,7 @@ have_sleep=1
while true
do
rm -f $safe_mysql_unix_port "$pid_file" # Some extra safety
rm -f "$pid_file" # Some extra safety
start_time=`date +%M%S`
@ -874,6 +876,11 @@ do
done
fi
log_notice "mysqld restarted"
if test -n "$CRASH_SCRIPT"
then
crash_script_output=`$CRASH_SCRIPT 2>&1`
log_error "$crash_script_output"
fi
done
log_notice "mysqld from pid file $pid_file ended"