Commit b287ca53 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.0 

into mysql.com:/tmp/skr99/mysql-4.0


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
myisam/myisam_ftdump.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents b2882fd4 b3851363

client/mysql.cc

+20 −5
Original line number Diff line number Diff line
@@ -590,6 +590,10 @@ static struct my_option my_long_options[] = 


static void usage(int version)

{

  /* Divert all help information on NetWare to logger screen. */

#ifdef __NETWARE__

#define printf	consoleprintf

#endif

  printf("%s  Ver %s Distrib %s, for %s (%s)\n",

	 my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);

  if (version)
@@ -602,8 +606,13 @@ and you are welcome to modify and redistribute it under the GPL license\n"); 
  my_print_help(my_long_options);

  print_defaults("my", load_default_groups);

  my_print_variables(my_long_options);

  NETWARE_SET_SCREEN_MODE(1);

#ifdef __NETWARE__

#undef printf

#endif

}





static my_bool

get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

	       char *argument)
@@ -812,6 +821,7 @@ static int read_lines(bool execute_commands) 
#ifdef __NETWARE__

      line=fgets(linebuffer, sizeof(linebuffer)-1, stdin);

      /* Remove the '\n' */

      if (line)

      {

        char *p = strrchr(line, '\n');

        if (p != NULL)
@@ -827,7 +837,11 @@ static int read_lines(bool execute_commands) 
      line= readline(prompt);

#endif /* defined( __WIN__) || defined(OS2) || defined(__NETWARE__) */



      if (opt_outfile)

      /*

        When Ctrl+d or Ctrl+z is pressed, the line may be NULL on some OS

        which may cause coredump.

      */

      if (opt_outfile && line)

	fprintf(OUTFILE, "%s\n", line);

    }

    if (!line)					// End of file
@@ -2018,10 +2032,8 @@ static int 
com_quit(String *buffer __attribute__((unused)),

	 char *line __attribute__((unused)))

{

#ifdef __NETWARE__

  // let the screen auto close on a normal shutdown

  setscreenmode(SCR_AUTOCLOSE_ON_EXIT);

#endif

  /* let the screen auto close on a normal shutdown */

  NETWARE_SET_SCREEN_MODE(SCR_AUTOCLOSE_ON_EXIT);

  status.exit_status=0;

  return 1;

}
@@ -2489,6 +2501,7 @@ void tee_fprintf(FILE *file, const char *fmt, ...) 
{

  va_list args;



  NETWARE_YIELD;

  va_start(args, fmt);

  (void) vfprintf(file, fmt, args);

#ifdef OS2
@@ -2502,6 +2515,7 @@ void tee_fprintf(FILE *file, const char *fmt, ...) 


void tee_fputs(const char *s, FILE *file)

{

  NETWARE_YIELD;

  fputs(s, file);

#ifdef OS2

  fflush( file);
@@ -2513,6 +2527,7 @@ void tee_fputs(const char *s, FILE *file) 


void tee_puts(const char *s, FILE *file)

{

  NETWARE_YIELD;

  fputs(s, file);

  fputs("\n", file);

#ifdef OS2

client/mysqladmin.c

+4 −0
Original line number Diff line number Diff line
@@ -815,11 +815,13 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
  return 0;

}



#include <help_start.h>



static void print_version(void)

{

  printf("%s  Ver %s Distrib %s, for %s on %s\n",my_progname,ADMIN_VERSION,

	 MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE);

  NETWARE_SET_SCREEN_MODE(1);

}
@@ -861,6 +863,8 @@ static void usage(void) 
  version		Get version info from server");

}



#include <help_end.h>



static int drop_db(MYSQL *mysql, const char *db)

{

  char name_buff[FN_REFLEN+20], buf[10];

client/mysqlbinlog.cc

+5 −0
Original line number Diff line number Diff line
@@ -479,9 +479,12 @@ static void die(const char* fmt, ...) 
  exit(1);

}



#include <help_start.h>



static void print_version()

{

  printf("%s Ver 2.6 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);

  NETWARE_SET_SCREEN_MODE(1);

}
@@ -500,6 +503,8 @@ the mysql command line client\n\n"); 
  my_print_variables(my_long_options);

}



#include <help_end.h>



extern "C" my_bool

get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

	       char *argument)

client/mysqlcheck.c

+4 −0
Original line number Diff line number Diff line
@@ -159,10 +159,13 @@ static void print_result(); 
static char *fix_table_name(char *dest, char *src);

int what_to_do = 0;



#include <help_start.h>



static void print_version(void)

{

  printf("%s  Ver %s Distrib %s, for %s (%s)\n", my_progname, CHECK_VERSION,

   MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);

  NETWARE_SET_SCREEN_MODE(1);

} /* print_version */
@@ -193,6 +196,7 @@ static void usage(void) 
  my_print_variables(my_long_options);

} /* usage */



#include <help_end.h>



static my_bool

get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

client/mysqldump.c

+7 −1
Original line number Diff line number Diff line
@@ -267,11 +267,13 @@ static char *quote_name(const char *name, char *buff, my_bool force); 
static void print_quoted_xml(FILE *output, char *fname, char *str, uint len);

static const char *check_if_ignore_table(const char *table_name);



#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);

  NETWARE_SET_SCREEN_MODE(1);

} /* print_version */
@@ -281,8 +283,10 @@ static void short_usage_sub(void) 
  printf("OR     %s [OPTIONS] --databases [OPTIONS] DB1 [DB2 DB3...]\n",

	 my_progname);

  printf("OR     %s [OPTIONS] --all-databases [OPTIONS]\n", my_progname);

  NETWARE_SET_SCREEN_MODE(1);

}





static void usage(void)

{

  print_version();
@@ -302,6 +306,8 @@ static void short_usage(void) 
  printf("For more options, use %s --help\n", my_progname);

}



#include <help_end.h>





static void write_header(FILE *sql_file, char *db_name)

{