diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-19 08:53:58 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-19 12:29:37 +0300 |
| commit | 13a350ac29eeb43153c7bca65b73b5dfa9f8ffb5 (patch) | |
| tree | b13da72226623745f0607609e2bb3dcaac4a11c6 /storage/xtradb/ibuf | |
| parent | d0eb4ee96b32caec1d6bba6dc376016b2bf2ac0f (diff) | |
| parent | 54bb04f7efc1d0842b3d8befb670f5d9f05cb211 (diff) | |
| download | mariadb-git-13a350ac29eeb43153c7bca65b73b5dfa9f8ffb5.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'storage/xtradb/ibuf')
| -rw-r--r-- | storage/xtradb/ibuf/ibuf0ibuf.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/xtradb/ibuf/ibuf0ibuf.cc b/storage/xtradb/ibuf/ibuf0ibuf.cc index e66568565e1..0445bb557e1 100644 --- a/storage/xtradb/ibuf/ibuf0ibuf.cc +++ b/storage/xtradb/ibuf/ibuf0ibuf.cc @@ -2963,8 +2963,7 @@ ibuf_get_volume_buffered_hash( fold = ut_fold_binary(data, len); hash += (fold / (CHAR_BIT * sizeof *hash)) % size; - bitmask = static_cast<ulint>( - 1 << (fold % (CHAR_BIT * sizeof(*hash)))); + bitmask = static_cast<ulint>(1) << (fold % (CHAR_BIT * sizeof(*hash))); if (*hash & bitmask) { @@ -3733,7 +3732,7 @@ fail_exit: if (mode == BTR_MODIFY_PREV) { err = btr_cur_optimistic_insert( - BTR_NO_LOCKING_FLAG, + BTR_NO_LOCKING_FLAG | BTR_NO_UNDO_LOG_FLAG, cursor, &offsets, &offsets_heap, ibuf_entry, &ins_rec, &dummy_big_rec, 0, thr, &mtr); |