summaryrefslogtreecommitdiff
path: root/mysys/my_bitmap.c
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2018-03-26 17:23:21 +0300
committerMonty <monty@mariadb.org>2018-03-29 14:20:11 +0300
commit33fa6abd0292a2e5f215096317acb8575e2fa89f (patch)
tree7357a2cb354fc8cff2ba319cbb59c8cc43286f7a /mysys/my_bitmap.c
parent75dd94c7cec7672d90cc3d437c1e105cda1d48a6 (diff)
downloadmariadb-git-33fa6abd0292a2e5f215096317acb8575e2fa89f.tar.gz
Ensure that map->mutex is reset in my_bitmap_init
Diffstat (limited to 'mysys/my_bitmap.c')
-rw-r--r--mysys/my_bitmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c
index b6963739613..4db6b8a44f8 100644
--- a/mysys/my_bitmap.c
+++ b/mysys/my_bitmap.c
@@ -174,6 +174,7 @@ my_bool my_bitmap_init(MY_BITMAP *map, my_bitmap_map *buf, uint n_bits,
my_bool thread_safe)
{
DBUG_ENTER("my_bitmap_init");
+ map->mutex= 0;
if (!buf)
{
uint size_in_bytes= bitmap_buffer_size(n_bits);
@@ -183,7 +184,6 @@ my_bool my_bitmap_init(MY_BITMAP *map, my_bitmap_map *buf, uint n_bits,
size_in_bytes= ALIGN_SIZE(size_in_bytes);
extra= sizeof(mysql_mutex_t);
}
- map->mutex= 0;
if (!(buf= (my_bitmap_map*) my_malloc(size_in_bytes+extra, MYF(MY_WME))))
DBUG_RETURN(1);
if (thread_safe)