fixes for windows 64-bit compiler warnings

2 files changed, 5 insertions, 5 deletions

diff --git a/heap/hp_hash.c b/heap/hp_hash.c
index 7f02eb587a8..9e4636ebdc0 100644
--- a/heap/hp_hash.c
+++ b/heap/hp_hash.c
@@ -778,7 +778,7 @@ uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key,
     key+= seg->length;
   }
   memcpy(key, &recpos, sizeof(byte*));
-  return key - start_key;
+  return (uint) (key - start_key);
 }
 
 
@@ -844,7 +844,7 @@ uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old,
     key+= seg->length;
     k_len-= seg->length;
   }
-  return key - start_key;
+  return (uint) (key - start_key);
 }
 
 
@@ -866,7 +866,7 @@ uint hp_rb_null_key_length(HP_KEYDEF *keydef, const byte *key)
       continue;
     key+= seg->length;
   }
-  return key - start_key;
+  return (uint) (key - start_key);
 }
                   
 
@@ -886,7 +886,7 @@ uint hp_rb_var_key_length(HP_KEYDEF *keydef, const byte *key)
     }
     key+= length;
   }
-  return key - start_key;
+  return (uint) (key - start_key);
 }
 
 
diff --git a/heap/hp_update.c b/heap/hp_update.c
index 2f4ea75f9aa..63ada225f06 100644
--- a/heap/hp_update.c
+++ b/heap/hp_update.c
@@ -60,7 +60,7 @@ int heap_update(HP_INFO *info, const byte *old, const byte *heap_new)
  err:
   if (my_errno == HA_ERR_FOUND_DUPP_KEY)
   {
-    info->errkey = keydef - share->keydef;
+    info->errkey = (int) (keydef - share->keydef);
     if (keydef->algorithm == HA_KEY_ALG_BTREE)
     {
       /* we don't need to delete non-inserted key from rb-tree */