diff options
| author | unknown <lenz@mysql.com> | 2002-11-25 13:14:38 +0100 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2002-11-25 13:14:38 +0100 |
| commit | e0baab2eb0f0de4c26bb0568b3afcabb40b36ac9 (patch) | |
| tree | da1760288618a653a974badb831b79ffde8e7c42 /support-files/mysql.server.sh | |
| parent | bb948c635507db07365554d0e33bc09522c77557 (diff) | |
| download | mariadb-git-e0baab2eb0f0de4c26bb0568b3afcabb40b36ac9.tar.gz | |
mysql.server.sh:
- reverted some incompatible/non-portable modifications
support-files/mysql.server.sh:
- reverted non-portable change ("echo -n" does not work on all platforms)
- reverted incompatible change (better fix the docs than break existing
installations)
Diffstat (limited to 'support-files/mysql.server.sh')
| -rw-r--r-- | support-files/mysql.server.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 91821fd09e5..1b050bad627 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -79,7 +79,7 @@ parse_arguments() { done } -# Get arguments from the my.cnf file, groups [mysqld] and [mysql.server] +# Get arguments from the my.cnf file, groups [mysqld] and [mysql_server] if test -x ./bin/my_print_defaults then print_defaults="./bin/my_print_defaults" @@ -117,7 +117,7 @@ else test -z "$print_defaults" && print_defaults="my_print_defaults" fi -parse_arguments `$print_defaults $defaults mysqld mysql.server` +parse_arguments `$print_defaults $defaults mysqld mysql_server` # Safeguard (relative paths, core dumps..) cd $basedir @@ -154,7 +154,7 @@ case "$mode" in sleep 1 while [ -s $pid_file -a "$flags" != aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ] do - [ -z "$flags" ] && echo -n "Wait for mysqld to exit" || echo -n "." + [ -z "$flags" ] && echo "Wait for mysqld to exit\c" || echo ".\c" flags=a$flags sleep 1 done |