Commit 44a631f1 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

parents cde8c0ed edc6dc48

Docs/mirrors.texi

+6 −5
Original line number Diff line number Diff line
@@ -183,16 +183,16 @@ FTP (@uref{ftp://sunsite.icm.edu.pl/pub/unix/mysql/}) 
WWW (@uref{http://darkstar.ist.utl.pt/mysql/})

FTP (@uref{ftp://darkstar.ist.utl.pt/pub/mysql/})



@item

@image{Flags/portugal} Portugal [Netc] @@

WWW (@uref{http://ftp.netc.pt/pub/mysql/})

FTP (@uref{ftp://ftp.netc.pt/pub/mysql/})



@item

@image{Flags/portugal} Portugal [Netviso] @@

WWW (@uref{http://mysql.netvisao.pt/})

FTP (@uref{ftp://mirrors2.netvisao.pt/pub/mysql/})



@item

@image{Flags/portugal} Portugal [VIZZAVI] @@

WWW (@uref{http://ftp.vizzavi.pt/pub/mysql/})

FTP (@uref{ftp://ftp.vizzavi.pt/pub/mysql/})



@item

@image{Flags/romania} Romania [roedu.net/Bucharest] @@

FTP (@uref{ftp://ftp.roedu.net/pub/mirrors/ftp.mysql.com/})
@@ -432,3 +432,4 @@ FTP (@uref{ftp://ftp.is.co.za/linux/mysql/}) 


@end itemize

client/mysql.cc

+134 −138
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <signal.h>

#include <violite.h>



const char *VER= "12.7";

const char *VER= "12.10";



/* Don't try to make a nice table if the data is too big */

#define MAX_COLUMN_LENGTH	     1024
@@ -440,7 +440,7 @@ static struct my_option my_long_options[] = 
   "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, 0, 0, 0, 0, 0, 0},

  {"no-auto-rehash", 'A',

   "No automatic rehashing. One has to use 'rehash' to get table and field completion. This gives a quicker start of mysql and disables rehashing on reconnect. WARNING: options depricated; use --disable-auto-rehash instead.",

   "No automatic rehashing. One has to use 'rehash' to get table and field completion. This gives a quicker start of mysql and disables rehashing on reconnect. WARNING: options deprecated; use --disable-auto-rehash instead.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"batch", 'B',

   "Print results with a tab as separator, each row on new line. Doesn't use history file.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -468,7 +468,7 @@ static struct my_option my_long_options[] = 
   (gptr*) &ignore_errors, (gptr*) &ignore_errors, 0, GET_BOOL, NO_ARG, 0, 0,

   0, 0, 0, 0},

  {"no-named-commands", 'g',

   "Named commands are disabled. Use \\* form only, or use named commands only in the beginning of a line ending with a semicolon (;) Since version 10.9 the client now starts with this option ENABLED by default! Disable with '-G'. Long format commands still work from the first line. WARNING: option depricated; use --disable-named-commands instead.",

   "Named commands are disabled. Use \\* form only, or use named commands only in the beginning of a line ending with a semicolon (;) Since version 10.9 the client now starts with this option ENABLED by default! Disable with '-G'. Long format commands still work from the first line. WARNING: option deprecated; use --disable-named-commands instead.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"named-commands", 'G',

   "Enable named commands. Named commands mean this program's internal commands; see mysql> help . When enabled, the named commands can be used from any line of the query, otherwise only from the first line, before an enter. Disable with --disable-named-commands. This option is disabled by default.",
@@ -489,14 +489,14 @@ static struct my_option my_long_options[] = 
  {"line-numbers", OPT_LINE_NUMBERS, "Write line numbers for errors.",

   (gptr*) &line_numbers, (gptr*) &line_numbers, 0, GET_BOOL,

   NO_ARG, 0, 0, 0, 0, 0, 0},  

  {"skip-line-numbers", 'L', "Don't write line number for errors. WARNING: -L is depricated, use long version of this option instead.", 0, 0, 0, GET_NO_ARG,

  {"skip-line-numbers", 'L', "Don't write line number for errors. WARNING: -L is deprecated, use long version of this option instead.", 0, 0, 0, GET_NO_ARG,

   NO_ARG, 0, 0, 0, 0, 0, 0},

#ifndef __WIN__

  {"no-pager", OPT_NOPAGER,

   "Disable pager and print to stdout. See interactive help (\\h) also. WARNING: option depricated; use --disable-pager instead.",

   "Disable pager and print to stdout. See interactive help (\\h) also. WARNING: option deprecated; use --disable-pager instead.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"no-tee", OPT_NOTEE, "Disable outfile. See interactive help (\\h) also. WARNING: option depricated; use --disable-tee instead", 0, 0, 0, GET_NO_ARG,

  {"no-tee", OPT_NOTEE, "Disable outfile. See interactive help (\\h) also. WARNING: option deprecated; use --disable-tee instead", 0, 0, 0, GET_NO_ARG,

   NO_ARG, 0, 0, 0, 0, 0, 0},

  {"unbuffered", 'n', "Flush buffer after each query.", (gptr*) &unbuffered,

   (gptr*) &unbuffered, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -504,10 +504,10 @@ static struct my_option my_long_options[] = 
   (gptr*) &column_names, (gptr*) &column_names, 0, GET_BOOL,

   NO_ARG, 1, 0, 0, 0, 0, 0},

  {"skip-column-names", 'N',

   "Don't write column names in results. WARNING: -N is depricated, use long version of this options instead.",

   "Don't write column names in results. WARNING: -N is deprecated, use long version of this options instead.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"set-variable", 'O',

   "Change the value of a variable. Please note that this option is depricated; you can set variables directly with --variable-name=value.",

   "Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"one-database", 'o',

   "Only update the default database. This is useful for skipping updates to other database in the update log.",
@@ -617,21 +617,18 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
    {

      if (opt_outfile)

	end_tee();

	opt_outfile= 0;

    }

    else

      if (!opt_outfile)

      {

	strmov(outfile, argument);

	  opt_outfile= 1;

	init_tee();

      }

    break;

  case OPT_NOTEE:

      printf("WARNING: option depricated; use --disable-tee instead.\n");

    printf("WARNING: option deprecated; use --disable-tee instead.\n");

    if (opt_outfile)

      end_tee();

      opt_outfile= 0;

    break;

  case OPT_PAGER:

    opt_nopager= 0;
@@ -642,12 +639,15 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
    strmov(default_pager, pager);

    break;

  case OPT_NOPAGER:

      printf("WARNING: option depricated; use --disable-pager instead.\n");

    printf("WARNING: option deprecated; use --disable-pager instead.\n");

    opt_nopager= 1;

    break;

  case 'A':

    rehash= 0;

    break;

  case 'N':

    column_names= 0;

    break;

  case 'e':

    status.batch= 1;

    status.add_to_history= 0;
@@ -739,11 +739,7 @@ static int get_options(int argc, char **argv) 
  strmov(default_pager, pager);



  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))

  {

    printf("%s: handle_options() failed with error %d\n", my_progname,

	   ho_error);

    exit(1);

  }

    exit(ho_error);



  if (status.batch) /* disable pager and outfile in this case */

  {
@@ -1514,17 +1510,22 @@ static void end_pager() 


static void init_tee()

{

  if (opt_outfile)

    end_tee();

  if (!(OUTFILE= my_fopen(outfile, O_APPEND | O_WRONLY, MYF(MY_WME))))

  {

    opt_outfile= 0;

    init_pager();

    return;

  }

  opt_outfile= 1;

  tee_fprintf(stdout, "Logging to file '%s'\n", outfile);

}



static void end_tee()

{

  my_fclose(OUTFILE, MYF(0));

  opt_outfile= 0;

  return;

}
@@ -1610,7 +1611,8 @@ print_table_data(MYSQL_RES *result) 
      uint length= field->max_length;

      if (length > MAX_COLUMN_LENGTH)

      {

	tee_fputs(str,PAGER); tee_fputs(" |",PAGER);

	tee_fputs(str, PAGER);

	tee_fputs(" |", PAGER);

      }

      else

      tee_fprintf(PAGER, num_flag[off] ? "%*s |" : " %-*s|",
@@ -1830,7 +1832,7 @@ com_tee(String *buffer, char *line __attribute__((unused))) 
  {

    if (!strlen(outfile))

    {

      printf("No previous outfile available, you must give the filename!\n");

      printf("No previous outfile available, you must give a filename!\n");

      opt_outfile= 0;

      return 0;

    }
@@ -1850,12 +1852,7 @@ com_tee(String *buffer, char *line __attribute__((unused))) 
    printf("No outfile specified!\n");

    return 0;

  }

  if (!opt_outfile)

  {

  init_tee();

    opt_outfile=1;

  }

  tee_fprintf(stdout, "Logging to file '%s'\n", outfile);

  return 0;

}
@@ -1865,7 +1862,6 @@ com_notee(String *buffer __attribute__((unused)), 
{

  if (opt_outfile)

    end_tee();

  opt_outfile=0;

  tee_fprintf(stdout, "Outfile disabled.\n");

  return 0;

}
@@ -2288,11 +2284,11 @@ com_status(String *buffer __attribute__((unused)), 
    }

#ifdef HAVE_OPENSSL

    if (mysql.net.vio->ssl_ && SSL_get_cipher(mysql.net.vio->ssl_))

      tee_fprintf(stdout, "SSL cipher in use is %s\n",

      tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n",

		  SSL_get_cipher(mysql.net.vio->ssl_));

    else

#endif /* HAVE_OPENSSL */

      tee_puts("SSL is not in use\n", stdout);

      tee_puts("SSL:\t\t\tNot in use", stdout);

  }

  else

  {

client/mysqladmin.c

+4 −7
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <my_pthread.h>				/* because of signal()	*/

#endif



#define ADMIN_VERSION "8.34"

#define ADMIN_VERSION "8.35"

#define MAX_MYSQL_VAR 64

#define SHUTDOWN_DEF_TIMEOUT 3600		/* Wait for shutdown */

#define MAX_TRUNC_LENGTH 3
@@ -130,7 +130,7 @@ static struct my_option my_long_options[] = 
   (gptr*) &opt_relative, (gptr*) &opt_relative, 0, GET_BOOL, NO_ARG, 0, 0, 0,

  0, 0, 0},

  {"set-variable", 'O',

   "Change the value of a variable. Please note that this option is depricated; you can set variables directly with --variable-name=value.",

   "Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"silent", 's', "Silently exit if one can't connect to server",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -247,11 +247,8 @@ int main(int argc,char *argv[]) 
     free_defaults()

  */

  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))

  {

    printf("%s: handle_options() failed with error %d\n", my_progname,

	   ho_error);

    exit(1);

  }

    exit(ho_error);



  if (argc == 0)

  {

    usage();

client/mysqlbinlog.cc

+3 −6
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void die(const char* fmt, ...) 


static void print_version()

{

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

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

}
@@ -223,11 +223,8 @@ static int parse_args(int *argc, char*** argv) 


  result_file = stdout;

  if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))

  {

    printf("%s: handle_options() failed with error %d\n", my_progname,

	   ho_error);

    exit(1);

  }

    exit(ho_error);



  return 0;

}

client/mysqlcheck.c

+2 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


/* By Jani Tolonen, 2001-04-20, MySQL Development Team */



#define CHECK_VERSION "2.3"

#define CHECK_VERSION "2.4"



#include "client_priv.h"

#include <m_ctype.h>
@@ -265,11 +265,7 @@ static int get_options(int *argc, char ***argv) 
  load_defaults("my", load_default_groups, argc, argv);



  if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))

  {

    printf("%s: handle_options() failed with error %d\n", my_progname,

	   ho_error);

    exit(1);

  }

    exit(ho_error);



  if (!what_to_do)

  {