From f2e1e3ce4c72d383f16fd8c525b28c4912e8f2de Mon Sep 17 00:00:00 2001 From: "monty@mysql.com" <> Date: Tue, 25 May 2004 22:00:14 +0300 Subject: Added patches from Novell --- myisam/myisam_ftdump.c | 3 +++ myisam/myisamchk.c | 4 ++++ myisam/myisampack.c | 4 ++++ 3 files changed, 11 insertions(+) (limited to 'myisam') diff --git a/myisam/myisam_ftdump.c b/myisam/myisam_ftdump.c index d06cb46bdc1..98548de26a4 100644 --- a/myisam/myisam_ftdump.c +++ b/myisam/myisam_ftdump.c @@ -258,15 +258,18 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), return 0; } +#include static void usage() { printf("Use: myisam_ftdump \n"); my_print_help(my_long_options); my_print_variables(my_long_options); + NETWARE_SET_SCREEN_MODE(1); exit(1); } +#include static void complain(int val) /* Kinda assert :-) */ { diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 3df42fb4da7..5377ecc18a5 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -323,10 +323,13 @@ static struct my_option my_long_options[] = }; +#include + static void print_version(void) { printf("%s Ver 2.6 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE); + NETWARE_SET_SCREEN_MODE(1); } @@ -433,6 +436,7 @@ static void usage(void) my_print_variables(my_long_options); } +#include /* Read options */ diff --git a/myisam/myisampack.c b/myisam/myisampack.c index 800203a30e2..872fcb49faf 100644 --- a/myisam/myisampack.c +++ b/myisam/myisampack.c @@ -266,12 +266,15 @@ static struct my_option my_long_options[] = { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} }; +#include static void print_version(void) { printf("%s Ver 1.22 for %s on %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE); + NETWARE_SET_SCREEN_MODE(1); } + static void usage(void) { print_version(); @@ -290,6 +293,7 @@ static void usage(void) my_print_variables(my_long_options); } +#include static my_bool get_one_option(int optid, const struct my_option *opt __attribute__((unused)), -- cgit v1.2.1