bk commit into 5.1 tree (Kristofer.Pettersson:1.2364)

[kpettersson]

Below is the list of changes that have just been committed into a local
5.1 repository of Kristofer Pettersson. When Kristofer Pettersson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-11 10:43:14+01:00, Kristofer.Pettersson@naruto. +1 -0
  Merge naruto.:C:/cpp/bug24751/my50-bug24751
  into  naruto.:C:/cpp/bug24751/my51-bug24751
  MERGE: 1.1810.2359.29

  mysys/mf_iocache.c@stripped, 2007-01-11 10:43:01+01:00, Kristofer.Pettersson@naruto. +0 -0
    Auto merged
    MERGE: 1.56.1.5

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	Kristofer.Pettersson
# Host:	naruto.
# Root:	C:/cpp/bug24751/my51-bug24751/RESYNC

--- 1.61/mysys/mf_iocache.c	2007-01-11 10:43:32 +01:00
+++ 1.62/mysys/mf_iocache.c	2007-01-11 10:43:32 +01:00
@@ -201,11 +201,11 @@ int init_io_cache(IO_CACHE *info, File f
   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;
@@ -224,7 +224,8 @@ int init_io_cache(IO_CACHE *info, File f
       }
       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));
     }
   }