diff options
author | Michael Widenius <monty@askmonty.org> | 2014-02-05 19:23:11 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2014-02-05 19:23:11 +0200 |
commit | 10001c8e4f4bf08b3c491dce2714e13cca667890 (patch) | |
tree | 738ffc405ffa9a11753f7b9a781f244dc270f803 /sql/partition_info.cc | |
parent | f68eac2eadb9bdb3d9c3554b37d6c253f04562d2 (diff) | |
parent | 5426facdcbfba2d78dab3c709cbf278073383b7c (diff) | |
download | mariadb-git-10001c8e4f4bf08b3c491dce2714e13cca667890.tar.gz |
Automatic merge
Diffstat (limited to 'sql/partition_info.cc')
-rw-r--r-- | sql/partition_info.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index ca455c0d7bc..1ae62011b43 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -385,7 +385,7 @@ bool partition_info::can_prune_insert(THD* thd, DBUG_RETURN(true); } /* Also clears all bits. */ - if (bitmap_init(used_partitions, bitmap_buf, num_partitions, false)) + if (my_bitmap_init(used_partitions, bitmap_buf, num_partitions, false)) { /* purecov: begin deadcode */ /* Cannot happen, due to pre-alloc. */ |