bzr commit into mysql-6.0-bugteam branch (vvaintroub:3238) Bug#43932

[Vladislav Vaintroub]

#At file:///G:/bzr/60bt/ based on revid:v.narayanan@stripped

 3238 Vladislav Vaintroub	2009-04-29 [merge]
      merge fix for Bug#43932 from 5.1-bugteam

    modified:
      mysys/mf_keycache.c
=== modified file 'mysys/mf_keycache.c'
--- a/mysys/mf_keycache.c	2009-03-17 20:07:27 +0000
+++ b/mysys/mf_keycache.c	2009-04-29 12:24:51 +0000
@@ -2077,13 +2077,15 @@ restart:
         }
         else
         {
+          size_t block_mem_offset;
           /* There are some never used blocks, take first of them */
           DBUG_ASSERT(keycache->blocks_used <
                       (ulong) keycache->disk_blocks);
           block= &keycache->block_root[keycache->blocks_used];
+          block_mem_offset= 
+           ((size_t) keycache->blocks_used) * keycache->key_cache_block_size;
           block->buffer= ADD_TO_PTR(keycache->block_mem,
-                                    ((ulong) keycache->blocks_used*
-                                     keycache->key_cache_block_size),
+                                    block_mem_offset,
                                     uchar*);
           keycache->blocks_used++;
           DBUG_ASSERT(!block->next_used);


Attachment: [text/bzr-bundle] bzr/[e-mail]