mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint

Browse source 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
This commit is contained in:
mtaylor@qualinost.(none) 2007-03-20 11:18:40 -07:00
commit 1f1bb54c19
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
support-files/mysql.server.sh
View file

@ -46,6 +46,13 @@
basedir= basedir=
datadir= datadir=
# Default value, in seconds, afterwhich the script should timeout waiting
# for server start.
# Value here is overriden by value in my.cnf.
# 0 means don't wait at all
# Negative numbers mean to wait indefinitely
service_startup_timeout=900
# The following variables are only set for letting mysql.server find things. # The following variables are only set for letting mysql.server find things.
# Set some defaults # Set some defaults
@ -126,6 +133,7 @@ parse_server_arguments() {
;; ;;
--user=*) user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; --user=*) user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
--pid-file=*) server_pid_file=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; --pid-file=*) server_pid_file=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
--service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
--use-mysqld_safe) use_mysqld_safe=1;; --use-mysqld_safe) use_mysqld_safe=1;;
--use-manager) use_mysqld_safe=0;; --use-manager) use_mysqld_safe=0;;
esac esac
@ -143,7 +151,7 @@ parse_manager_arguments() {
wait_for_pid () { wait_for_pid () {
i=0 i=0
while test $i -lt 900 ; do while test $i -ne $service_startup_timeout ; do
sleep 1 sleep 1
case "$1" in case "$1" in
'created') 'created')