Commit 60677ffd authored by monty@donna.mysql.com's avatar monty@donna.mysql.com
Browse files

Cleanup of tests 

Fixed bug with ALTER TABLE on HEAP tables
parent 767e2ef6

Docs/manual.texi

+7 −5
Original line number Diff line number Diff line
@@ -38289,10 +38289,11 @@ To be consistent with our setup, you should put your result files in 
test produces more than one result, you should use @code{test_name.a.result},

@code{test_name.b.result}, etc

@item

Failed test results are put in a file with the same name as the result file

followed by @code{.reject} extenstion. If your test case is failing, you

should do a diff on the two files. If you cannot see how they are different,

examine both with @code{od -c} and also check their lengths.

Failed test results are put in a file with the same base name as the

result file with the @code{.reject} extenstion. If your test case is

failing, you should do a diff on the two files. If you cannot see how

they are different, examine both with @code{od -c} and also check their

lengths.

@item

You can prefix a query with @code{!} if the test can continue after that query

returns an error.
@@ -40057,7 +40058,8 @@ though, so Version 3.23 is not released as a stable version yet. 
@itemize @bullet

@item

Allow hex constants in the @code{--fields-*-by} and

@code{--lines-terminated-by} options to @code{mysqldump}. By Paul DuBois.

@code{--lines-terminated-by} options to @code{mysqldump} and

@code{mysqlimport}. By Paul DuBois.

@item

Added option @code{--safe-show-databases}.

@item

client/my_readline.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ typedef struct st_line_buffer 
  uint bufread;			/* Number of bytes to get with each read(). */

  uint eof;

  ulong max_size;

  ulong read_length;		/* Length of last read string */

} LINE_BUFFER;



extern LINE_BUFFER *batch_readline_init(ulong max_size,FILE *file);

client/mysql.cc

+0 −1
Original line number Diff line number Diff line
@@ -903,7 +903,6 @@ static bool add_line(String &buffer,char *line,char *in_string) 
      continue;

#ifdef USE_MB

    int l;

/*    if ((l = ismbchar(pos, pos+MBMAXLEN))) {  Wei He: I think it's wrong! */

    if (use_mb(default_charset_info) &&

        (l = my_ismbchar(default_charset_info, pos, strend))) {

	while (l--)

client/mysqladmin.c

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ static struct option long_options[] = { 
  {"socket",             required_argument, 0, 'S'},

  {"sleep",              required_argument, 0, 'i'},

#include "sslopt-longopts.h"

  {"connect-timeout",    required_argument, 0, 't'},

#ifndef DONT_ALLOW_USER_CHANGE

  {"user",               required_argument, 0, 'u'},

#endif

client/mysqldump.c

+9 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
**   Tnu Samuel  <tonu@please.do.not.remove.this.spam.ee>

**/



#define DUMP_VERSION "8.11"

#define DUMP_VERSION "8.12"



#include <global.h>

#include <my_sys.h>
@@ -862,11 +862,16 @@ static char *add_load_option(char *ptr,const char *object, 
			     const char *statement)

{

  if (object)

  {

	if (!strncasecmp(object,"0x",2))	/* hex constant; don't escape */

		ptr= strxmov(ptr," ",statement," ",object,NullS);

	else								/* char constant; escape */

	{

		ptr= strxmov(ptr," ",statement," '",NullS);

		ptr= field_escape(ptr,object,(uint) strlen(object));

		*ptr++= '\'';

	}

  }

  return ptr;

} /* add_load_option */