Commit cef86787 authored by unknown's avatar unknown
Browse files

Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 

into eagle.mysql.r18.ru:/home/vva/work/BUG_5492/mysql-4.0
parents 34474695 d47c79a0

sql/records.cc

+7 −1
Original line number Diff line number Diff line
@@ -249,9 +249,15 @@ static int init_rr_cache(READ_RECORD *info) 
  rec_cache_size=info->cache_records*info->reclength;

  info->rec_cache_size=info->cache_records*info->ref_length;



  /*

      We are going to read the last three bytes of the buffer via uint3korr

      This macro reads actually 4 bytes (for speed)

      So, we have to allocate one more byte at the end of the buffer 

      to avoid memory assertion fault 

  */

  if (info->cache_records <= 2 ||

      !(info->cache=(byte*) my_malloc_lock(rec_cache_size+info->cache_records*

					   info->struct_length,

					   info->struct_length+1,

					   MYF(0))))

    DBUG_RETURN(1);

#ifdef HAVE_purify