From 743ad144ebff9e70b14450afbf97146178568b01 Mon Sep 17 00:00:00 2001
From: "jperkin/mysqldev@mysql.com/production.mysql.com" <>
Date: Fri, 16 May 2008 11:01:59 +0200
Subject: [PATCH 1/2] Raise version number after cloning 5.0.62

---
 configure.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index d40df7b7895..db14982840d 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.0.62)
+AM_INIT_AUTOMAKE(mysql, 5.0.64)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
 # ndb version
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=62
+NDB_VERSION_BUILD=64
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?

From f9d183b5dc8b414948b20296ff1f754bdcad5943 Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/hfmain.(none)" <>
Date: Sat, 17 May 2008 12:53:47 +0500
Subject: [PATCH 2/2] Bug #36705 key_buffer_size of >= 2G allocates all
 availabel virtual memory on 64-bit wondo.

temporary variables of 'long' types were used to store ulong values,
that causes init_key_cache to receive distorted parameters
---
 sql/handler.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/handler.cc b/sql/handler.cc
index 40b85a0901c..0de772e366b 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -2350,8 +2350,8 @@ int ha_init_key_cache(const char *name, KEY_CACHE *key_cache)
   if (!key_cache->key_cache_inited)
   {
     pthread_mutex_lock(&LOCK_global_system_variables);
-    long tmp_buff_size= (long) key_cache->param_buff_size;
-    long tmp_block_size= (long) key_cache->param_block_size;
+    ulong tmp_buff_size= (ulong) key_cache->param_buff_size;
+    uint tmp_block_size= (uint) key_cache->param_block_size;
     uint division_limit= key_cache->param_division_limit;
     uint age_threshold=  key_cache->param_age_threshold;
     pthread_mutex_unlock(&LOCK_global_system_variables);