summaryrefslogtreecommitdiff
path: root/storage/heap
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-04-07 15:58:46 +0200
committerSergei Golubchik <sergii@pisem.net>2012-04-07 15:58:46 +0200
commitf860b2aad41cd1b5ed0438ea211dcd78eec82b94 (patch)
tree650133297bec368a1cdeb50ea1950e1b4d1b679e /storage/heap
parentb43494620f6cd57e8249940f4fb0406ffff8dff7 (diff)
parentb95ae56b9f47cc19d3498d4be3142b2449a04600 (diff)
downloadmariadb-git-f860b2aad41cd1b5ed0438ea211dcd78eec82b94.tar.gz
merge
Diffstat (limited to 'storage/heap')
-rw-r--r--storage/heap/hp_write.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/heap/hp_write.c b/storage/heap/hp_write.c
index 0169d12392d..8bfecc7747c 100644
--- a/storage/heap/hp_write.c
+++ b/storage/heap/hp_write.c
@@ -105,7 +105,7 @@ int hp_rb_write_key(HP_INFO *info, HP_KEYDEF *keyinfo, const uchar *record,
uchar *recpos)
{
heap_rb_param custom_arg;
- uint old_allocated;
+ size_t old_allocated;
custom_arg.keyseg= keyinfo->seg;
custom_arg.key_length= hp_rb_make_key(keyinfo, info->recbuf, record, recpos);