Commit 81006dd2 authored by monty@work.mysql.com's avatar monty@work.mysql.com
Browse files

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

into work.mysql.com:/home/bk/mysql-4.0
parents 279de0c6 55dd01cc

Docs/manual.texi

+3 −0
Original line number Diff line number Diff line
@@ -46908,6 +46908,9 @@ not yet 100% confident in this code. 
@appendixsubsec Changes in release 3.23.42

@itemize @bullet

@item

Fixed problem with @code{REPAIR TABLE} on MyISAM tables with row lengths

between 65517 - 65520 bytes

@item

Fixed rare hang when doing @code{mysqladmin shutdown} when there was

a lot of activity in other threads.

@item

client/mysqldump.c

+12 −3
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.15"

#define DUMP_VERSION "8.16"



#include <global.h>

#include <my_sys.h>
@@ -1060,7 +1060,12 @@ static void dumpTable(uint numFields, char *table) 
		dynstr_append(&extended_row,"\'");

	      }

	      else

		dynstr_append(&extended_row,row[i]);

	      {

		/* change any strings ("inf","nan",..) into NULL */

		char *ptr = row[i];

		dynstr_append(&extended_row,

			      (!isalpha(*ptr)) ? ptr : "NULL");

	      }

	    }

	    else

	      dynstr_append(&extended_row,"\'\'");
@@ -1080,7 +1085,11 @@ static void dumpTable(uint numFields, char *table) 
	    if (!IS_NUM_FIELD(field))

	      unescape(md_result_file, row[i], lengths[i]);

	    else

	      fputs(row[i],md_result_file);

	    {

	      /* change any strings ("inf","nan",..) into NULL */

	      char *ptr = row[i];

	      fputs((!isalpha(*ptr)) ? ptr : "NULL", md_result_file);

	    }

	  }

	  else

	  {

include/raid.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ const char *my_raid_type(int raid_type); 
}

#endif



#ifdef USE_RAID

#if defined(USE_RAID) && !defined(DONT_USE_RAID)



#ifdef __GNUC__

#pragma interface			/* gcc class implementation */

libmysql/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
# This file is public domain and comes with NO WARRANTY of any kind



target = libmysqlclient.la

target_defs = -DUNDEF_THREADS_HACK

target_defs = -DUNDEF_THREADS_HACK -DDONT_USE_RAID

LIBS   = @CLIENT_LIBS@

INCLUDES =	-I$(srcdir)/../include -I../include \

		-I$(srcdir)/.. -I$(top_srcdir) -I.. $(openssl_includes)

libmysql_r/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 




target = libmysqlclient_r.la

target_defs =

target_defs = -DDONT_USE_RAID

## LIBS = @LIBS@



INCLUDES =	@MT_INCLUDES@ -I$(srcdir)/../include -I../include \