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

a fix (#2185: mysql.server script echo bug)

thnx Paul.                                             
              
<monty> can you get the above into configure and make Makefile.am patch         
mysql.server.sh with the right values for mysql.server ?                        
<monty> or do you think we should just put the above in mysql.server.sh directly
<ramil> as you want                                                             
<monty> the last is kind of hard to do with variables, so lets put the          
above in mysql.server.sh directly                                               
                                                                  
parent 0216948c
...@@ -59,6 +59,14 @@ export PATH ...@@ -59,6 +59,14 @@ export PATH
mode=$1 # start or stop mode=$1 # start or stop
case `echo "testing\c"`,`echo -n testing` in
*c,*) echo_n=-n echo_c= ;;
*,-n*) echo_n= echo_c='\c' ;;
*) echo_n= echo_c='
'
;;
esac
parse_arguments() { parse_arguments() {
for arg do for arg do
case "$arg" in case "$arg" in
...@@ -169,7 +177,7 @@ case "$mode" in ...@@ -169,7 +177,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