summaryrefslogtreecommitdiff
path: root/isam
diff options
context:
space:
mode:
authorjani@a193-229-222-105.elisa-laajakaista.fi <>2005-08-24 22:03:34 +0300
committerjani@a193-229-222-105.elisa-laajakaista.fi <>2005-08-24 22:03:34 +0300
commitfe977b0cd0f2cbabd0a3804cfd83a02698601ad7 (patch)
treec0c34797bba5e900d1bd182f5a096c63abba60d1 /isam
parent9f72d504b42d0e944bbb84a235075a29696f1358 (diff)
downloadmariadb-git-fe977b0cd0f2cbabd0a3804cfd83a02698601ad7.tar.gz
Several fixes for Netware.
Diffstat (limited to 'isam')
-rw-r--r--isam/isamchk.c11
-rw-r--r--isam/pack_isam.c4
2 files changed, 14 insertions, 1 deletions
diff --git a/isam/isamchk.c b/isam/isamchk.c
index daa9464eb4f..d0c0ff68aef 100644
--- a/isam/isamchk.c
+++ b/isam/isamchk.c
@@ -97,7 +97,7 @@ typedef struct st_isam_sort_info {
enum ic_options {OPT_CHARSETS_DIR_IC=256, OPT_KEY_BUFFER_SIZE,
OPT_READ_BUFFER_SIZE, OPT_WRITE_BUFFER_SIZE,
OPT_SORT_BUFFER_SIZE, OPT_SORT_KEY_BLOCKS,
- OPT_DECODE_BITS};
+ OPT_DECODE_BITS, OPT_AUTO_CLOSE};
static ulong use_buffers=0,read_buffer_length=0,write_buffer_length=0,
sort_buffer_length=0,sort_key_blocks=0,crc=0,unique_count=0;
@@ -243,6 +243,10 @@ static struct my_option my_long_options[] =
{"analyze", 'a',
"Analyze distribution of keys. Will make some joins in MySQL faster.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+#ifdef __NETWARE__
+ {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
+ 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
{"character-sets-dir", OPT_CHARSETS_DIR_IC,
"Directory where character sets are", (gptr*) &charsets_dir,
(gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -591,6 +595,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
{
switch(optid) {
+#ifdef __NETWARE__
+ case OPT_AUTO_CLOSE:
+ setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+ break;
+#endif
case 'a':
testflag|= T_STATISTICS;
break;
diff --git a/isam/pack_isam.c b/isam/pack_isam.c
index b2e21afc743..b6659934029 100644
--- a/isam/pack_isam.c
+++ b/isam/pack_isam.c
@@ -276,6 +276,8 @@ static struct my_option my_long_options[] =
};
+#include <help_start.h>
+
static void print_version(void)
{
printf("%s Ver 5.10 for %s on %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);
@@ -299,6 +301,8 @@ static void usage(void)
my_print_variables(my_long_options);
}
+#include <help_end.h>
+
static my_bool
get_one_option(int optid, const struct my_option *opt __attribute__((unused)),