Commit c9087113 authored by ram@gw.mysql.r18.ru's avatar ram@gw.mysql.r18.ru

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2185
parents a3dc5449 e4bde991
...@@ -59,6 +59,12 @@ export PATH ...@@ -59,6 +59,12 @@ export PATH
mode=$1 # start or stop 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() { parse_arguments() {
for arg do for arg do
case "$arg" in case "$arg" in
...@@ -169,7 +175,7 @@ case "$mode" in ...@@ -169,7 +175,7 @@ case "$mode" in
sleep 1 sleep 1
while [ -s $pid_file -a "$flags" != aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ] while [ -s $pid_file -a "$flags" != aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ]
do 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 flags=a$flags
sleep 1 sleep 1
done done
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment