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

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2185

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