Commit 8ec12a86 authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
parents fc5aff71 ea09b970

client/client_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -49,5 +49,6 @@ enum options_client 
#ifdef HAVE_NDBCLUSTER_DB

  ,OPT_NDBCLUSTER,OPT_NDB_CONNECTSTRING

#endif

  ,OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_DROP_DATABASE

  ,OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_DROP_DATABASE,

  OPT_AUTO_CLOSE

};

client/mysql.cc

+9 −0
Original line number Diff line number Diff line
@@ -508,6 +508,10 @@ static struct my_option my_long_options[] = 
   0, 0, 0, 0, 0},

  {"help", 'I', "Synonym for -?", 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},
@@ -729,6 +733,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.cc

+4 −4
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static TYPELIB command_typelib= 
static struct my_option my_long_options[] =

{

#ifdef __NETWARE__

  {"autoclose", 'a', " Auto close the screen on exit for 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',
@@ -227,8 +227,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 


  switch(optid) {

#ifdef __NETWARE__

  case 'a':

   setscreenmode(SCR_AUTOCLOSE_ON_EXIT);      // auto close the screen /

  case OPT_AUTO_CLOSE:

    setscreenmode(SCR_AUTOCLOSE_ON_EXIT);

    break;

#endif

  case 'c':

client/mysqlbinlog.cc

+10 −0
Original line number Diff line number Diff line
@@ -431,6 +431,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},
@@ -616,6 +621,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);

client/mysqlcheck.c

+9 −0
Original line number Diff line number Diff line
@@ -62,6 +62,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,
@@ -221,6 +225,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;