diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/my_print_defaults.c | 9 | ||||
| -rw-r--r-- | extra/mysql_install.c | 9 | ||||
| -rw-r--r-- | extra/perror.c | 9 | ||||
| -rw-r--r-- | extra/resolve_stack_dump.c | 9 | ||||
| -rw-r--r-- | extra/resolveip.c | 9 |
5 files changed, 15 insertions, 30 deletions
diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c index 2c87ee11820..c0f8a54f432 100644 --- a/extra/my_print_defaults.c +++ b/extra/my_print_defaults.c @@ -55,7 +55,7 @@ static struct my_option my_long_options[] = static void usage(my_bool version) { - printf("%s Ver 1.4 for %s at %s\n",my_progname,SYSTEM_TYPE, + printf("%s Ver 1.5 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE); if (version) return; @@ -92,11 +92,8 @@ static int get_options(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); + if (*argc < 1) { usage(0); diff --git a/extra/mysql_install.c b/extra/mysql_install.c index 0153ad3bf70..e2783f906b9 100644 --- a/extra/mysql_install.c +++ b/extra/mysql_install.c @@ -18,7 +18,7 @@ /* Install or upgrade MySQL server. By Sasha Pachev <sasha@mysql.com> */ -#define INSTALL_VERSION "1.1" +#define INSTALL_VERSION "1.2" #define DONT_USE_RAID #include <my_global.h> @@ -219,11 +219,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; } diff --git a/extra/perror.c b/extra/perror.c index da62913b4a4..4d05adf29aa 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -16,7 +16,7 @@ /* Return error-text for system error messages and nisam messages */ -#define PERROR_VERSION "2.8" +#define PERROR_VERSION "2.9" #include <my_global.h> #include <my_sys.h> @@ -141,11 +141,8 @@ static int get_options(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); + if (!*argc && !print_all_codes) { usage(); diff --git a/extra/resolve_stack_dump.c b/extra/resolve_stack_dump.c index 23f22e276a6..8379da97795 100644 --- a/extra/resolve_stack_dump.c +++ b/extra/resolve_stack_dump.c @@ -30,7 +30,7 @@ #define INIT_SYM_TABLE 4096 #define INC_SYM_TABLE 4096 #define MAX_SYM_SIZE 128 -#define DUMP_VERSION "1.3" +#define DUMP_VERSION "1.4" #define HEX_INVALID (uchar)255 typedef ulong my_long_addr_t ; /* at some point, we need to fix configure @@ -121,11 +121,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); + /* The following code is to make the command compatible with the old version that required one to use the -n and -s options diff --git a/extra/resolveip.c b/extra/resolveip.c index f4b703bec4f..6665ceebf1d 100644 --- a/extra/resolveip.c +++ b/extra/resolveip.c @@ -16,7 +16,7 @@ /* Resolves IP's to hostname and hostnames to IP's */ -#define RESOLVE_VERSION "2.1" +#define RESOLVE_VERSION "2.2" #include <my_global.h> #include <m_ctype.h> @@ -94,11 +94,8 @@ static int get_options(int *argc,char ***argv) /* load_defaults("my",load_default_groups,argc,argv); */ 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); + if (*argc == 0) { usage(); |