diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-09 12:22:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-09 12:22:55 +0300 |
| commit | a9d0bb12e68a11c119a3534f354c7a7ef13dd5b5 (patch) | |
| tree | d8fe35019461ba33ca4469131d92a2307cbade7e /support-files | |
| parent | 4145618103253f634027d15dab3618abfd4ff227 (diff) | |
| parent | c89e3b70a740f486db2c60270892ba2893bb5610 (diff) | |
| download | mariadb-git-a9d0bb12e68a11c119a3534f354c7a7ef13dd5b5.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.server.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index d2c824697d1..dd8cbd4850e 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -9,7 +9,7 @@ # When this is done the mysql server will be started when the machine is # started and shut down when the systems goes down. -# Comments to support chkconfig on RedHat Linux +# Comments to support chkconfig on Red Hat Linux # chkconfig: 2345 64 36 # description: A very fast and reliable SQL database engine. @@ -52,7 +52,7 @@ datadir= # Negative numbers mean to wait indefinitely service_startup_timeout=900 -# Lock directory for RedHat / SuSE. +# Lock directory for Red Hat / SuSE. lockdir='/var/lock/subsys' lock_file_path="$lockdir/mysql" @@ -91,7 +91,7 @@ datadir_set= # # Use LSB init script functions for printing messages, if possible -# Include non-LSB RedHat init functions to make systemctl redirect work +# Include non-LSB Red Hat init functions to make systemctl redirect work init_functions="/etc/init.d/functions" lsb_functions="/lib/lsb/init-functions" if test -f $lsb_functions; then @@ -100,6 +100,7 @@ fi if test -f $init_functions; then . $init_functions +else log_success_msg() { echo " SUCCESS! $@" @@ -309,7 +310,7 @@ case "$mode" in $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mariadbd_pid_file_path" "$@" & wait_for_ready; return_value=$? - # Make lock for RedHat / SuSE + # Make lock for Red Hat / SuSE if test -w "$lockdir" then touch "$lock_file_path" @@ -339,7 +340,7 @@ case "$mode" in rm "$mariadbd_pid_file_path" fi - # Delete lock for RedHat / SuSE + # Delete lock for Red Hat / SuSE if test -f "$lock_file_path" then rm -f "$lock_file_path" |