Commit 97dbe8db authored by unknown's avatar unknown
Browse files

Several fixes for Netware. 


client/client_priv.h:
  Added option auto close for Netware.
client/mysql.cc:
  Added option auto close for Netware.
client/mysqladmin.c:
  Added option auto close for Netware.
client/mysqlbinlog.cc:
  Added option auto close for Netware.
client/mysqlcheck.c:
  Added option auto close for Netware.
client/mysqldump.c:
  Added option auto close for Netware.
client/mysqlimport.c:
  Added option auto close for Netware.
client/mysqlshow.c:
  Added option auto close for Netware.
client/mysqltest.c:
  Fixed help messages for Netware.
extra/my_print_defaults.c:
  Fixed help messages for Netware.
extra/perror.c:
  Fixed help messages for Netware.
extra/resolve_stack_dump.c:
  Fixed help messages for Netware.
include/help_end.h:
  Fixed help messages for Netware.
include/help_start.h:
  Fixed help messages for Netware.
isam/isamchk.c:
  Added auto close of window for Netware
isam/pack_isam.c:
  Added auto close of window for Netware
myisam/myisamchk.c:
  Added auto close of window for Netware
myisam/myisamlog.c:
  Added help for Netware.
myisam/myisampack.c:
  Added auto close for Netware.
netware/myisamchk.def:
  Scrollable screen patch.
netware/mysql.def:
  Scrollable screen patch.
netware/mysql_test_run.c:
  Fixed strindex for Netware.
netware/mysqladmin.def:
  Scrollable screen patch.
netware/mysqlbinlog.def:
  Scrollable screen patch.
netware/mysqlcheck.def:
  Scrollable screen patch.
netware/mysqld_safe.c:
  Removed debug message for Netware.
netware/mysqldump.def:
  Scrollable screen patch.
netware/mysqlimport.def:
  Scrollable screen patch.
netware/mysqlshow.def:
  Scrollable screen patch.
sql/mysqld.cc:
  Abnormal end patch when shutting down and volume not ready.
parent 4c76d94f

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -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 };

client/mysql.cc

+9 −0
Original line number Diff line number Diff line
@@ -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;

client/mysqladmin.c

+9 −0
Original line number Diff line number Diff line
@@ -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;

client/mysqlbinlog.cc

+11 −1
Original line number Diff line number Diff line
@@ -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 ':'

client/mysqlcheck.c

+9 −0
Original line number Diff line number Diff line
@@ -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;