Commit 7c548f66 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work.mysql.com:/home/bk/mysql 

into mysql.sashanet.com:/home/sasha/src/bk/mysql
parents 14854a66 f5e13042

Docs/manual.texi

+524 −433

File changed.

Preview size limit exceeded, changes collapsed.

client/mysql.cc

+16 −18
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static HashTable ht; 
enum enum_info_type { INFO_INFO,INFO_ERROR,INFO_RESULT};

typedef enum enum_info_type INFO_TYPE;



const char *VER="11.4";

const char *VER="11.6";



static MYSQL mysql;			/* The connection */

static bool info_flag=0,ignore_errors=0,wait_flag=0,quick=0,
@@ -496,14 +496,12 @@ static void usage(int version) 
			Give a variable an value. --help lists variables.\n\

  -o, --one-database	Only update the default database. This is useful\n\

			for skipping updates to other database in the update\n\

			log.\n\

  --tee=...             Append everything into outfile. See interactive help\n\

                        (\\h) also. Does not work in batch mode.\n");

			log.\n");

#ifndef __WIN__

  printf("\

  --pager[=...]         Output type. Default is your ENV variable PAGER.\n\

                        Valid pagers are less, more, cat [> filename], etc.\n\

                        See interactive help (\\h) also. This options does\n\

                        See interactive help (\\h) also. This option does\n\

                        not work in batch mode.\n");

#endif

  printf("\
@@ -524,7 +522,9 @@ static void usage(int version) 
#include "sslopt-usage.h"

  printf("\

  -t  --table		Output in table format.\n\

  -T, --debug-info	Print some debug info at exit.\n");

  -T, --debug-info	Print some debug info at exit.\n\

  --tee=...             Append everything into outfile. See interactive help\n\

                        (\\h) also. Does not work in batch mode.\n");

#ifndef DONT_ALLOW_USER_CHANGE

  printf("\

  -u, --user=#		User for login if not current user.\n");
@@ -763,16 +763,6 @@ static int read_lines(bool execute_commands) 
	status.query_start_line=line_number;

    }

    else

#ifdef __WIN__

    {

      tee_fprintf(stdout, glob_buffer.is_empty() ? "mysql> " :

		  !in_string ? "    -> " :

		  in_string == '\'' ?

		  "    '> " : "    \"> ");

      linebuffer[0]=(char) sizeof(linebuffer);

      line=_cgets(linebuffer);

    }

#else

    {

      if (opt_outfile)

      {
@@ -783,14 +773,22 @@ static int read_lines(bool execute_commands) 
	      in_string == '\'' ?

	      "    '> " : "    \"> ", OUTFILE);

      }

#ifdef __WIN__

      tee_fprintf(stdout, glob_buffer.is_empty() ? "mysql> " :

		  !in_string ? "    -> " :

		  in_string == '\'' ?

		  "    '> " : "    \"> ");

      linebuffer[0]=(char) sizeof(linebuffer);

      line=_cgets(linebuffer);

#else

      line=readline((char*) (glob_buffer.is_empty() ? "mysql> " :

			     !in_string ? "    -> " :

			     in_string == '\'' ?

			     "    '> " : "    \"> "));

#endif

      if (opt_outfile)

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

    }

#endif

    if (!line)					// End of file

    {

      status.exit_status=0;
@@ -1762,7 +1760,7 @@ com_pager(String *buffer, char *line __attribute__((unused))) 
  {

    if (!strlen(default_pager))

    {

      tee_fprintf(stdout, "Default pager wasn't available, using stdout.\n");

      tee_fprintf(stdout, "Default pager wasn't set, using stdout.\n");

      opt_nopager=1;

      strmov(pager, "stdout");

      PAGER= stdout;

client/mysqladmin.c

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

#endif



#define ADMIN_VERSION "8.11"

#define ADMIN_VERSION "8.12"

#define MAX_MYSQL_VAR 64

#define MAX_TIME_TO_WAIT 3600			/* Wait for shutdown */

#define MAX_TRUNC_LENGTH 3

extra/perror.c

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ static HA_ERRORS ha_errlist[]= 
  { 142,"Unknown character set used"},

  { 143,"Conflicting table definition between MERGE and mapped table"},

  { 144,"Table is crashed and last repair failed"},

  { 145,"Table was marked as crashed and should be repaired"},

  { 0,NullS },

};

include/my_base.h

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ enum ha_base_keytype { 
#define HA_ERR_UNKNOWN_CHARSET	 142	/* Can't open charset */

#define HA_ERR_WRONG_TABLE_DEF	 143

#define HA_ERR_CRASHED_ON_REPAIR 144	/* Last (automatic?) repair failed */

#define HA_ERR_CRASHED_ON_USAGE  145	/* Table must be repaired */



	/* Other constants */