diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-09 14:54:57 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-09 14:54:57 -0500 |
| commit | 31eaa90a6ef767b4f846bfe454892979200003a1 (patch) | |
| tree | ac63b8be86cc6d9bfc148407fc5631bd342741c8 /support-files | |
| parent | 088c069462d4a5cf26e97690e045fc3e737453a3 (diff) | |
| download | mariadb-git-31eaa90a6ef767b4f846bfe454892979200003a1.tar.gz | |
Merging revision 3839..3932 from codership-mysql/5.5.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.server.sh | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 8da75c92a6c..c703d576307 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -397,33 +397,6 @@ case "$mode" in fi fi ;; - 'configtest') - # Safeguard (relative paths, core dumps..) - cd $basedir - echo $echo_n "Testing MySQL configuration syntax" - daemon=$bindir/mysqld - if test -x $libexecdir/mysqld - then - daemon=$libexecdir/mysqld - elif test -x $sbindir/mysqld - then - daemon=$sbindir/mysqld - elif test -x `which mysqld` - then - daemon=`which mysqld` - else - log_failure_msg "Unable to locate the mysqld binary!" - exit 1 - fi - help_out=`$daemon --help 2>&1`; r=$? - if test "$r" != 0 ; then - log_failure_msg "$help_out" - log_failure_msg "There are syntax errors in the server configuration. Please fix them!" - else - log_success_msg "Syntax OK" - fi - exit $r - ;; 'bootstrap') # Bootstrap the cluster, start the first node # that initiate the cluster @@ -433,7 +406,7 @@ case "$mode" in *) # usage basename=`basename "$0"` - echo "Usage: $basename {start|stop|restart|reload|force-reload|status|configtest|bootstrap} [ MySQL server options ]" + echo "Usage: $basename {start|stop|restart|reload|force-reload|status|bootstrap} [ MySQL server options ]" exit 1 ;; esac |