diff options
author | Alexey Botchkov <holyfoot@askmonty.org> | 2012-04-06 14:24:00 +0500 |
---|---|---|
committer | Alexey Botchkov <holyfoot@askmonty.org> | 2012-04-06 14:24:00 +0500 |
commit | 4632f33d33f80ca584818851d774748c51002e31 (patch) | |
tree | 10ab351930fda25f43391933be35f22508b314a7 | |
parent | a3073ecd96a829aaff87c6386e0766fc1440922b (diff) | |
parent | ab5c6cd736d89bc9838303ba781efcdf3038590f (diff) | |
download | mariadb-git-4632f33d33f80ca584818851d774748c51002e31.tar.gz |
merging.
-rw-r--r-- | storage/heap/hp_write.c | 2 |
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); |