summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2012-04-06 13:51:42 +0500
committerAlexey Botchkov <holyfoot@askmonty.org>2012-04-06 13:51:42 +0500
commit8c57baf5f5ab0e503f8d28fa8ee370588e199d0e (patch)
tree90862bafcef799a9d6a261ddacce2f0c7c39a4dc
parent8a1530488b7edd4a41b0a4e000c465278209e02b (diff)
parentef05759057695c1b2cf7273b41e5b5944964590d (diff)
downloadmariadb-git-8c57baf5f5ab0e503f8d28fa8ee370588e199d0e.tar.gz
merging.
-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 5996d9b2682..d67b55b6481 100644
--- a/storage/heap/hp_write.c
+++ b/storage/heap/hp_write.c
@@ -106,7 +106,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);