Commit 55dd01cc authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

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

parents d836dbf9 0b2af6bd

Docs/manual.texi

+3 −0
Original line number Diff line number Diff line
@@ -46707,6 +46707,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

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..

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 \

myisam/mi_check.c

+1 −1
Original line number Diff line number Diff line
@@ -2480,7 +2480,7 @@ int sort_write_record(SORT_INFO *sort_info) 
      info->checksum=mi_checksum(info,sort_info->record);

      reclength=_mi_rec_pack(info,from,sort_info->record);

      info->s->state.checksum+=info->checksum;

      block_length=reclength+ 3 +test(reclength > 65532L);

      block_length=reclength+ 3 + test(reclength >= (65520-3));

      if (block_length < share->base.min_block_length)

	block_length=share->base.min_block_length;

      flag=0;