1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure that map->mutex is reset in my_bitmap_init

Browse Source
This commit is contained in:
Monty 2018-03-26 17:23:21 +03:00
parent 75dd94c7ce
commit 33fa6abd02
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/my_bitmap.c
View File

@ -174,6 +174,7 @@ my_bool my_bitmap_init(MY_BITMAP *map, my_bitmap_map *buf, uint n_bits,
my_bool thread_safe) my_bool thread_safe)
{ {
DBUG_ENTER("my_bitmap_init"); DBUG_ENTER("my_bitmap_init");
map->mutex= 0;
if (!buf) if (!buf)
{ {
uint size_in_bytes= bitmap_buffer_size(n_bits); 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); size_in_bytes= ALIGN_SIZE(size_in_bytes);
extra= sizeof(mysql_mutex_t); extra= sizeof(mysql_mutex_t);
} }
map->mutex= 0;
if (!(buf= (my_bitmap_map*) my_malloc(size_in_bytes+extra, MYF(MY_WME)))) if (!(buf= (my_bitmap_map*) my_malloc(size_in_bytes+extra, MYF(MY_WME))))
DBUG_RETURN(1); DBUG_RETURN(1);
if (thread_safe) if (thread_safe)