Commit 90bec9ce authored by unknown's avatar unknown
Browse files

Merge naruto.:C:/cpp/bug24751/my50-bug24751 

into  naruto.:C:/cpp/mysql-5.0-maint


mysys/mf_iocache.c:
  Auto merged
parents f7f69043 029d6cf9

mysys/mf_iocache.c

+4 −3
Original line number Diff line number Diff line
@@ -200,11 +200,11 @@ int init_io_cache(IO_CACHE *info, File file, uint cachesize, 
  if (type != READ_NET && type != WRITE_NET)

  {

    /* Retry allocating memory in smaller blocks until we get one */

    cachesize=(uint) ((ulong) (cachesize + min_cache-1) &

			(ulong) ~(min_cache-1));

    for (;;)

    {

      uint buffer_block;

      cachesize=(uint) ((ulong) (cachesize + min_cache-1) &

			(ulong) ~(min_cache-1));

      if (cachesize < min_cache)

	cachesize = min_cache;

      buffer_block = cachesize;
@@ -223,7 +223,8 @@ int init_io_cache(IO_CACHE *info, File file, uint cachesize, 
      }

      if (cachesize == min_cache)

	DBUG_RETURN(2);				/* Can't alloc cache */

      cachesize= (uint) ((long) cachesize*3/4); /* Try with less memory */

      /* Try with less memory */

      cachesize= (uint) ((ulong) cachesize*3/4 & (ulong)~(min_cache-1));

    }

  }