diff options
author | jani@hynda.(none) <> | 2002-05-29 15:07:30 +0300 |
---|---|---|
committer | jani@hynda.(none) <> | 2002-05-29 15:07:30 +0300 |
commit | c961494444ccad68cb5b84da80397b5478cbeb03 (patch) | |
tree | f5eba07b104573f7bffdb03106d52dd2c350b85a /tools/mysqlmanager.c | |
parent | 51883b3239de575223a1b50b3cb95f6120b4122a (diff) | |
download | mariadb-git-c961494444ccad68cb5b84da80397b5478cbeb03.tar.gz |
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
Changed some exit code names and corresponding numbers.
Fixed a bug in mysqld.cc, in replication related options.
Added a global flag in my_getopt, which can be set by any program
that is using my_getopt, which tells whether the client should
print the error message itself, or whether my_getopt should do it.
The default is that my_getopt will print the error messages.
Diffstat (limited to 'tools/mysqlmanager.c')
-rw-r--r-- | tools/mysqlmanager.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/mysqlmanager.c b/tools/mysqlmanager.c index c8abb996794..82bc149ab34 100644 --- a/tools/mysqlmanager.c +++ b/tools/mysqlmanager.c @@ -41,8 +41,8 @@ #include <sys/wait.h> #endif -#define MANAGER_VERSION "1.1" -#define MANAGER_GREETING "MySQL Server Management Daemon v. 1.0" +#define MANAGER_VERSION "1.2" +#define MANAGER_GREETING "MySQL Server Management Daemon v. 1.2" #define LOG_ERR 1 #define LOG_WARN 2 @@ -1332,11 +1332,8 @@ static int parse_args(int argc, char **argv) int ho_error; if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option))) - { - printf("%s: handle_options() failed with error %d\n", my_progname, - ho_error); - exit(1); - } + exit(ho_error); + return 0; } |