diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-07 17:33:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-07 17:33:33 +0200 |
| commit | a2807e41e8fcac00711cf4465e910327bfd69fe2 (patch) | |
| tree | c94b0a32226b09e8675f8b9b559a610c554cda6b /storage/xtradb/ibuf | |
| parent | 8ee9d19607d84aeebf97b704a19453f6a772299b (diff) | |
| parent | 6cb3146af896eb7d27aed6815428008f105e8ae8 (diff) | |
| download | mariadb-git-a2807e41e8fcac00711cf4465e910327bfd69fe2.tar.gz | |
xtradb 5.6.17-65.0
Diffstat (limited to 'storage/xtradb/ibuf')
| -rw-r--r-- | storage/xtradb/ibuf/ibuf0ibuf.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/xtradb/ibuf/ibuf0ibuf.cc b/storage/xtradb/ibuf/ibuf0ibuf.cc index 7e5d5532ee3..3969d284a97 100644 --- a/storage/xtradb/ibuf/ibuf0ibuf.cc +++ b/storage/xtradb/ibuf/ibuf0ibuf.cc @@ -2963,7 +2963,8 @@ ibuf_get_volume_buffered_hash( fold = ut_fold_binary(data, len); hash += (fold / (CHAR_BIT * sizeof *hash)) % size; - bitmask = 1 << (fold % (CHAR_BIT * sizeof *hash)); + bitmask = static_cast<ulint>( + 1 << (fold % (CHAR_BIT * sizeof(*hash)))); if (*hash & bitmask) { @@ -3978,7 +3979,7 @@ skip_watch: /********************************************************************//** During merge, inserts to an index page a secondary index entry extracted -from the insert buffer. +from the insert buffer. @return newly inserted record */ static __attribute__((nonnull)) rec_t* |