summaryrefslogtreecommitdiff
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
commit25f6782dd4fba009c33338a4523db90f9a70bdae (patch)
tree10ab351930fda25f43391933be35f22508b314a7
parent7a5d4701c92444f58534d511e9a67065eb8efadd (diff)
parent8c57baf5f5ab0e503f8d28fa8ee370588e199d0e (diff)
downloadmariadb-git-25f6782dd4fba009c33338a4523db90f9a70bdae.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 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);