summaryrefslogtreecommitdiff
path: root/storage/heap/hp_write.c
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2012-04-06 14:24:00 +0500
committerAlexey Botchkov <holyfoot@askmonty.org>2012-04-06 14:24:00 +0500
commit4632f33d33f80ca584818851d774748c51002e31 (patch)
tree10ab351930fda25f43391933be35f22508b314a7 /storage/heap/hp_write.c
parenta3073ecd96a829aaff87c6386e0766fc1440922b (diff)
parentab5c6cd736d89bc9838303ba781efcdf3038590f (diff)
downloadmariadb-git-4632f33d33f80ca584818851d774748c51002e31.tar.gz
merging.
Diffstat (limited to 'storage/heap/hp_write.c')
-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 42d924d8f2d..990fcebcd63 100644
--- a/storage/heap/hp_write.c
+++ b/storage/heap/hp_write.c
@@ -107,7 +107,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);