diff options
| author | monty@mysql.com <> | 2004-02-11 00:06:46 +0100 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-02-11 00:06:46 +0100 |
| commit | ce145789092b294a562f565671478ae2bf51d14a (patch) | |
| tree | 927515d304bd661aebdb0e534418caf49d322ada /support-files/mysql.server.sh | |
| parent | 0c6a0b9a3118948efeedefd036d2994982babd08 (diff) | |
| parent | efb134f3a874befe4ab1779f597ada09f57ca191 (diff) | |
| download | mariadb-git-ce145789092b294a562f565671478ae2bf51d14a.tar.gz | |
Merge with 4.0.18
Diffstat (limited to 'support-files/mysql.server.sh')
| -rw-r--r-- | support-files/mysql.server.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 5911ecd942b..849f913bf6c 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -59,6 +59,12 @@ export PATH mode=$1 # start or stop +case `echo "testing\c"`,`echo -n testing` in + *c*,-n*) echo_n= echo_c= ;; + *c*,*) echo_n=-n echo_c= ;; + *) echo_n= echo_c='\c' ;; +esac + parse_arguments() { for arg do case "$arg" in @@ -169,7 +175,7 @@ case "$mode" in sleep 1 while [ -s $pid_file -a "$flags" != aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ] do - [ -z "$flags" ] && echo "Wait for mysqld to exit\c" || echo ".\c" + [ -z "$flags" ] && echo $echo_n "Wait for mysqld to exit$echo_c" || echo $echo_n ".$echo_c" flags=a$flags sleep 1 done |