diff options
| -rw-r--r-- | client/client_priv.h | 2 | ||||
| -rw-r--r-- | client/mysql.cc | 9 | ||||
| -rw-r--r-- | client/mysqladmin.c | 9 | ||||
| -rw-r--r-- | client/mysqlbinlog.cc | 12 | ||||
| -rw-r--r-- | client/mysqlcheck.c | 9 | ||||
| -rw-r--r-- | client/mysqldump.c | 9 | ||||
| -rw-r--r-- | client/mysqlimport.c | 9 | ||||
| -rw-r--r-- | client/mysqlshow.c | 9 | ||||
| -rw-r--r-- | client/mysqltest.c | 5 | ||||
| -rw-r--r-- | extra/my_print_defaults.c | 5 | ||||
| -rw-r--r-- | extra/perror.c | 5 | ||||
| -rw-r--r-- | extra/resolve_stack_dump.c | 5 | ||||
| -rw-r--r-- | include/help_end.h | 1 | ||||
| -rw-r--r-- | include/help_start.h | 2 | ||||
| -rw-r--r-- | isam/isamchk.c | 11 | ||||
| -rw-r--r-- | isam/pack_isam.c | 4 | ||||
| -rw-r--r-- | myisam/myisamchk.c | 12 | ||||
| -rw-r--r-- | myisam/myisamlog.c | 2 | ||||
| -rw-r--r-- | myisam/myisampack.c | 11 | ||||
| -rw-r--r-- | netware/myisamchk.def | 2 | ||||
| -rw-r--r-- | netware/mysql.def | 2 | ||||
| -rw-r--r-- | netware/mysql_test_run.c | 4 | ||||
| -rw-r--r-- | netware/mysqladmin.def | 2 | ||||
| -rw-r--r-- | netware/mysqlbinlog.def | 2 | ||||
| -rw-r--r-- | netware/mysqlcheck.def | 2 | ||||
| -rw-r--r-- | netware/mysqld_safe.c | 2 | ||||
| -rw-r--r-- | netware/mysqldump.def | 2 | ||||
| -rw-r--r-- | netware/mysqlimport.def | 2 | ||||
| -rw-r--r-- | netware/mysqlshow.def | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 16 |
30 files changed, 151 insertions, 18 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index 016c9e5ee80..3e4e4e0971d 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -39,4 +39,4 @@ enum options_client { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET, OPT_SSL_CIPHER, OPT_SHUTDOWN_TIMEOUT, OPT_LOCAL_INFILE, OPT_DELETE_MASTER_LOGS, OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION, OPT_FRM, - OPT_HEXBLOB }; + OPT_HEXBLOB, OPT_AUTO_CLOSE }; diff --git a/client/mysql.cc b/client/mysql.cc index 4aac548a065..bbe3212be14 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -441,6 +441,10 @@ static struct my_option my_long_options[] = { {"help", '?', "Display this help and exit.", 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 {"auto-rehash", OPT_AUTO_REHASH, "Enable automatic rehashing. One doesn't need to use 'rehash' to get table and field completion, but startup and reconnecting may take a longer time. Disable with --disable-auto-rehash.", (gptr*) &rehash, (gptr*) &rehash, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, @@ -620,6 +624,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), char *argument) { switch(optid) { +#ifdef __NETWARE__ + case OPT_AUTO_CLOSE: + setscreenmode(SCR_AUTOCLOSE_ON_EXIT); + break; +#endif case OPT_CHARSETS_DIR: strmov(mysql_charsets_dir, argument); charsets_dir = mysql_charsets_dir; diff --git a/client/mysqladmin.c b/client/mysqladmin.c index 978e0c7e88b..98e54b695b8 100644 --- a/client/mysqladmin.c +++ b/client/mysqladmin.c @@ -106,6 +106,10 @@ static TYPELIB command_typelib= static struct my_option my_long_options[] = { +#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 {"count", 'c', "Number of iterations to make. This works with -i (--sleep) only", (gptr*) &nr_iterations, (gptr*) &nr_iterations, 0, GET_UINT, @@ -184,6 +188,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), int error = 0; switch(optid) { +#ifdef __NETWARE__ + case OPT_AUTO_CLOSE: + setscreenmode(SCR_AUTOCLOSE_ON_EXIT); + break; +#endif case 'c': opt_count_iterations= 1; break; diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 7c3d22c4900..9ae280a997d 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -400,6 +400,11 @@ Create_file event for file_id: %u\n",exv->file_id); static struct my_option my_long_options[] = { + +#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 #ifndef DBUG_OFF {"debug", '#', "Output debug log.", (gptr*) &default_dbug_option, (gptr*) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, @@ -511,6 +516,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), { bool tty_password=0; switch (optid) { +#ifdef __NETWARE__ + case OPT_AUTO_CLOSE: + setscreenmode(SCR_AUTOCLOSE_ON_EXIT); + break; +#endif #ifndef DBUG_OFF case '#': DBUG_PUSH(argument ? argument : default_dbug_option); @@ -857,7 +867,7 @@ typedef struct st_my_tmpdir uint cur, max; } MY_TMPDIR; -#if defined( __WIN__) || defined(OS2) +#if defined( __WIN__) || defined(OS2) || defined(__NETWARE__) #define DELIM ';' #else #define DELIM ':' diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index b5a80782948..98ef59c19d8 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -56,6 +56,10 @@ static struct my_option my_long_options[] = "Instead of issuing one query for each table, use one query per database, naming all tables in the database in a comma-separated list.", (gptr*) &opt_all_in_1, (gptr*) &opt_all_in_1, 0, GET_BOOL, 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 {"auto-repair", OPT_AUTO_REPAIR, "If a checked table is corrupted, automatically fix it. Repairing will be done after all tables have been checked, if corrupted ones were found.", (gptr*) &opt_auto_repair, (gptr*) &opt_auto_repair, 0, GET_BOOL, NO_ARG, 0, @@ -203,6 +207,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), char *argument) { switch(optid) { +#ifdef __NETWARE__ + case OPT_AUTO_CLOSE: + setscreenmode(SCR_AUTOCLOSE_ON_EXIT); + break; +#endif case 'a': what_to_do = DO_ANALYZE; break; diff --git a/client/mysqldump.c b/client/mysqldump.c index 58d601654a4..145b84f3f45 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -111,6 +111,10 @@ static struct my_option my_long_options[] = {"allow-keywords", OPT_KEYWORDS, "Allow creation of column names that are keywords.", (gptr*) &opt_keywords, (gptr*) &opt_keywords, 0, GET_BOOL, 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, "Directory where character sets are", (gptr*) &charsets_dir, (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -346,6 +350,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), char *argument) { switch (optid) { +#ifdef __NETWARE__ + case OPT_AUTO_CLOSE: + setscreenmode(SCR_AUTOCLOSE_ON_EXIT); + break; +#endif case OPT_MASTER_DATA: opt_master_data=1; opt_first_slave=1; diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 50c3a26a882..24392fedc1f 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -51,6 +51,10 @@ static longlong opt_ignore_lines= -1; static struct my_option my_long_options[] = { +#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, "Directory where character sets are", (gptr*) &charsets_dir, (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -169,6 +173,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), char *argument) { switch(optid) { +#ifdef __NETWARE__ + case OPT_AUTO_CLOSE: + setscreenmode(SCR_AUTOCLOSE_ON_EXIT); + break; +#endif case 'p': if (argument) { diff --git a/client/mysqlshow.c b/client/mysqlshow.c index 1a9aec02955..35afc1f5780 100644 --- a/client/mysqlshow.c +++ b/client/mysqlshow.c @@ -138,6 +138,10 @@ int main(int argc, char **argv) static struct my_option my_long_options[] = { +#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", 'c', "Directory where character sets are", (gptr*) &charsets_dir, (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -218,6 +222,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), char *argument) { switch(optid) { +#ifdef __NETWARE__ + case OPT_AUTO_CLOSE: + setscreenmode(SCR_AUTOCLOSE_ON_EXIT); + break; +#endif case 'v': opt_verbose++; break; diff --git a/client/mysqltest.c b/client/mysqltest.c index 14e401f1708..582ce7c37ad 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1959,6 +1959,9 @@ 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 <help_start.h> + static void print_version(void) { printf("%s Ver %s Distrib %s, for %s (%s)\n",my_progname,MTEST_VERSION, @@ -1977,6 +1980,8 @@ void usage() 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)), diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c index f8a7995432b..d97153bd5a8 100644 --- a/extra/my_print_defaults.c +++ b/extra/my_print_defaults.c @@ -56,6 +56,9 @@ static struct my_option my_long_options[] = }; + +#include <help_start.h> + static void usage(my_bool version) { printf("%s Ver 1.6 for %s at %s\n",my_progname,SYSTEM_TYPE, @@ -70,6 +73,8 @@ static void usage(my_bool version) printf("\nExample usage:\n%s --config-file=my client mysql\n", my_progname); } +#include <help_end.h> + static my_bool get_one_option(int optid, const struct my_option *opt __attribute__((unused)), diff --git a/extra/perror.c b/extra/perror.c index b4aeaf00671..37658bd81d9 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -101,12 +101,15 @@ static HA_ERRORS ha_errlist[]= }; +#include <help_start.h> + static void print_version(void) { printf("%s Ver %s, for %s (%s)\n",my_progname,PERROR_VERSION, SYSTEM_TYPE,MACHINE_TYPE); } + static void usage(void) { print_version(); @@ -118,6 +121,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)), diff --git a/extra/resolve_stack_dump.c b/extra/resolve_stack_dump.c index c54f17a186e..623ae3d4379 100644 --- a/extra/resolve_stack_dump.c +++ b/extra/resolve_stack_dump.c @@ -65,12 +65,16 @@ static struct my_option my_long_options[] = static void verify_sort(); + +#include <help_start.h> + static void print_version(void) { printf("%s Ver %s Distrib %s, for %s (%s)\n",my_progname,DUMP_VERSION, MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE); } + static void usage() { print_version(); @@ -87,6 +91,7 @@ The numeric-dump-file should contain a numeric stack trace from mysqld.\n\ If the numeric-dump-file is not given, the stack trace is read from stdin.\n"); } +#include <help_end.h> static void die(const char* fmt, ...) diff --git a/include/help_end.h b/include/help_end.h index a63d9e7ca9f..3bd16c09e3b 100644 --- a/include/help_end.h +++ b/include/help_end.h @@ -2,5 +2,6 @@ #undef printf #undef puts #undef fputs +#undef fputc #undef putchar #endif diff --git a/include/help_start.h b/include/help_start.h index 38bb91f7655..7ffde1ab803 100644 --- a/include/help_start.h +++ b/include/help_start.h @@ -4,4 +4,6 @@ #define printf consoleprintf #define puts(s) consoleprintf("%s\n",s) #define fputs(s,f) puts(s) +#define fputc(s,f) consoleprintf("%c", s) +#define putchar(s) consoleprintf("%c", s) #endif 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)), diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 5377ecc18a5..c9f4c8b2b21 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -149,7 +149,8 @@ enum options_mc { OPT_CORRECT_CHECKSUM, OPT_KEY_BUFFER_SIZE, OPT_MYISAM_BLOCK_SIZE, OPT_READ_BUFFER_SIZE, OPT_WRITE_BUFFER_SIZE, OPT_SORT_BUFFER_SIZE, OPT_SORT_KEY_BLOCKS, OPT_DECODE_BITS, OPT_FT_MIN_WORD_LEN, - OPT_FT_MAX_WORD_LEN, OPT_FT_MAX_WORD_LEN_FOR_SORT, OPT_FT_STOPWORD_FILE + OPT_FT_MAX_WORD_LEN, OPT_FT_MAX_WORD_LEN_FOR_SORT, OPT_FT_STOPWORD_FILE, + OPT_AUTO_CLOSE }; static struct my_option my_long_options[] = @@ -157,6 +158,10 @@ static struct my_option my_long_options[] = {"analyze", 'a', "Analyze distribution of keys. Will make some joins in MySQL faster. You can check the calculated distribution.", 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 {"block-search", 'b', "No help available.", 0, 0, 0, GET_ULONG, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -446,6 +451,11 @@ get_one_option(int optid, char *argument) { switch (optid) { +#ifdef __NETWARE__ + case OPT_AUTO_CLOSE: + setscreenmode(SCR_AUTOCLOSE_ON_EXIT); + break; +#endif case 'a': if (argument == disabled_my_option) check_param.testflag&= ~T_STATISTICS; diff --git a/myisam/myisamlog.c b/myisam/myisamlog.c index 091f9ad1d7e..b2690c0e72b 100644 --- a/myisam/myisamlog.c +++ b/myisam/myisamlog.c @@ -251,6 +251,7 @@ static void get_options(register int *argc, register char ***argv) /* Fall through */ case 'I': case '?': +#include <help_start.h> printf("%s Ver 1.4 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE); puts("By Monty, for your professional use\n"); @@ -272,6 +273,7 @@ static void get_options(register int *argc, register char ***argv) puts("If a recover is done all writes and all possibly updates and deletes is done\nand errors are only counted."); puts("If one gives table names as arguments only these tables will be updated\n"); help=1; +#include <help_end.h> break; default: printf("illegal option: \"-%c\"\n",*pos); diff --git a/myisam/myisampack.c b/myisam/myisampack.c index 90689b08476..9f3c8f505f7 100644 --- a/myisam/myisampack.c +++ b/myisam/myisampack.c @@ -234,10 +234,14 @@ int main(int argc, char **argv) #endif } -enum options_mp {OPT_CHARSETS_DIR_MP=256}; +enum options_mp {OPT_CHARSETS_DIR_MP=256, OPT_AUTO_CLOSE}; static struct my_option my_long_options[] = { +#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 {"backup", 'b', "Make a backup of the table as table_name.OLD", (gptr*) &backup, (gptr*) &backup, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"character-sets-dir", OPT_CHARSETS_DIR_MP, @@ -305,6 +309,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), uint length; switch(optid) { +#ifdef __NETWARE__ + case OPT_AUTO_CLOSE: + setscreenmode(SCR_AUTOCLOSE_ON_EXIT); + break; +#endif case 'f': force_pack= 1; tmpfile_createflag= O_RDWR | O_TRUNC; diff --git a/netware/myisamchk.def b/netware/myisamchk.def index cdfe186058f..81a913efa2b 100644 --- a/netware/myisamchk.def +++ b/netware/myisamchk.def @@ -2,7 +2,7 @@ # MyISAM Check #------------------------------------------------------------------------------ MODULE libc.nlm -SCREENNAME "MySQL MyISAM Table Check Tool" +SCREENNAME "MySQL MyISAM Table Check Tool[scrollable]" COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL MyISAM Table Check Tool" VERSION 4, 0 diff --git a/netware/mysql.def b/netware/mysql.def index 9b4424ed4fb..6996bbb1f68 100644 --- a/netware/mysql.def +++ b/netware/mysql.def @@ -2,7 +2,7 @@ # MySQL Client #------------------------------------------------------------------------------ MODULE libc.nlm -SCREENNAME "MySQL Monitor" +SCREENNAME "MySQL Monitor[scrollable]" COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Monitor" VERSION 4, 0 diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c index 0b86e67fc68..28fbe34993d 100644 --- a/netware/mysql_test_run.c +++ b/netware/mysql_test_run.c @@ -27,6 +27,10 @@ #include "my_manage.h" +#ifdef __NETWARE__ +#define strindex(a,b) ((char*)strindex(a,b)) +#endif + /****************************************************************************** macros diff --git a/netware/mysqladmin.def b/netware/mysqladmin.def index 0ace36992b1..114d693585d 100644 --- a/netware/mysqladmin.def +++ b/netware/mysqladmin.def @@ -2,7 +2,7 @@ # MySQL Admin #------------------------------------------------------------------------------ MODULE libc.nlm -SCREENNAME "MySQL Admin" +SCREENNAME "MySQL Admin[scrollable]" COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Admin Tool" VERSION 4, 0 diff --git a/netware/mysqlbinlog.def b/netware/mysqlbinlog.def index 89677b4a353..a2d7d12fb31 100644 --- a/netware/mysqlbinlog.def +++ b/netware/mysqlbinlog.def @@ -2,7 +2,7 @@ # MySQL Binary Log #------------------------------------------------------------------------------ MODULE libc.nlm -SCREENNAME "MySQL Binary Log Dump Tool" +SCREENNAME "MySQL Binary Log Dump Tool[scrollable]" COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Binary Log Dump Tool" VERSION 4, 0 diff --git a/netware/mysqlcheck.def b/netware/mysqlcheck.def index 8820e9aae8e..5dea92e7185 100644 --- a/netware/mysqlcheck.def +++ b/netware/mysqlcheck.def @@ -2,7 +2,7 @@ # MySQL Client #------------------------------------------------------------------------------ MODULE libc.nlm -SCREENNAME "MySQL Check Tool" +SCREENNAME "MySQL Check Tool[scrollable]" COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Check Tool" VERSION 4, 0 diff --git a/netware/mysqld_safe.c b/netware/mysqld_safe.c index 8d4a5c4a296..dbb49882140 100644 --- a/netware/mysqld_safe.c +++ b/netware/mysqld_safe.c @@ -659,7 +659,6 @@ void mysql_start(int argc, char *argv[]) if(!strnicmp(argv[i], private_options[j], strlen(private_options[j])))
{
skip = TRUE;
- consoleprintf("The argument skipped is %s\n",argv[i]); break;
}
}
@@ -667,7 +666,6 @@ void mysql_start(int argc, char *argv[]) if (!skip) { add_arg(&al, "%s", argv[i]); - consoleprintf("The final argument is %s\n",argv[i]); } } // spawn
diff --git a/netware/mysqldump.def b/netware/mysqldump.def index 901c9b262dc..aacc763930f 100644 --- a/netware/mysqldump.def +++ b/netware/mysqldump.def @@ -2,7 +2,7 @@ # MySQL Admin #------------------------------------------------------------------------------ MODULE libc.nlm -SCREENNAME "MySQL Dump Tool" +SCREENNAME "MySQL Dump Tool[scrollable]" COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Dump Tool" VERSION 4, 0 diff --git a/netware/mysqlimport.def b/netware/mysqlimport.def index d6f7fcb6bbd..92f3f3690c6 100644 --- a/netware/mysqlimport.def +++ b/netware/mysqlimport.def @@ -2,7 +2,7 @@ # MySQL Client #------------------------------------------------------------------------------ MODULE libc.nlm -SCREENNAME "MySQL Import" +SCREENNAME "MySQL Import[scrollable]" COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Import Tool" VERSION 4, 0 diff --git a/netware/mysqlshow.def b/netware/mysqlshow.def index 2b41386f643..f6a8d938ff7 100644 --- a/netware/mysqlshow.def +++ b/netware/mysqlshow.def @@ -2,7 +2,7 @@ # MySQL Show #------------------------------------------------------------------------------ MODULE libc.nlm -SCREENNAME "MySQL Show" +SCREENNAME "MySQL Show[scrollable]" COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." DESCRIPTION "MySQL Show Tool" VERSION 4, 0 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index ac66874888b..89bb3e5220b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -113,6 +113,10 @@ int deny_severity = LOG_WARNING; #include <sys/mman.h> #endif +#define zVOLSTATE_ACTIVE 6 +#define zVOLSTATE_DEACTIVE 2 +#define zVOLSTATE_MAINTENANCE 3 + #ifdef __NETWARE__ #include <nks/netware.h> #include <nks/vm.h> @@ -130,6 +134,7 @@ VolumeID_t datavolid; event_handle_t eh; Report_t ref; void *refneb=NULL; +bool event_flag=FALSE; int volumeid=-1; /* NEB event callback */ @@ -804,7 +809,8 @@ static void __cdecl kill_server(int sig_ptr) unireg_end(); #ifdef __NETWARE__ - pthread_join(select_thread, NULL); // wait for main thread + if(!event_flag) + pthread_join(select_thread, NULL); // wait for main thread #endif /* __NETWARE__ */ pthread_exit(0); /* purecov: deadcode */ @@ -1468,6 +1474,7 @@ static void check_data_home(const char *path) // down server event callback void mysql_down_server_cb(void *, void *) { + event_flag = TRUE; kill_server(0); } @@ -1501,7 +1508,7 @@ void mysql_cb_init() Register for volume deactivation event Wrap the callback function, as it is called by non-LibC thread */ - (void)NX_WRAP_INTERFACE(neb_event_callback, 1, &refneb); + (void *)NX_WRAP_INTERFACE(neb_event_callback, 1, &refneb); registerwithneb(); NXVmRegisterExitHandler(mysql_cb_destroy, NULL); // clean-up @@ -1587,7 +1594,9 @@ ulong neb_event_callback(struct EventBlock *eblock) voldata= (EventChangeVolStateEnter_s *)eblock->EBEventData; /* Deactivation of a volume */ - if ((voldata->oldState == 6 && voldata->newState == 2)) + if ((voldata->oldState == zVOLSTATE_ACTIVE && + voldata->newState == zVOLSTATE_DEACTIVE || + voldata->newState == zVOLSTATE_MAINTENANCE)) { /* Ensure that we bring down MySQL server only for MySQL data @@ -1596,6 +1605,7 @@ ulong neb_event_callback(struct EventBlock *eblock) if (!memcmp(&voldata->volID, &datavolid, sizeof(VolumeID_t))) { consoleprintf("MySQL data volume is deactivated, shutting down MySQL Server \n"); + event_flag= TRUE; nw_panic = TRUE; kill_server(0); } |