Ensure that map->mutex is reset in my_bitmap_init

montywi · montywi · commit 33fa6abd0292 · 2018-03-29T14:20:11.000+03:00
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,7 @@ my_bool my_bitmap_init(MY_BITMAP map, my_bitmap_map buf, uint n_bits,`
`174`	`174`	`my_bool thread_safe)`
`175`	`175`	`{`
`176`	`176`	`DBUG_ENTER("my_bitmap_init");`
	`177`	`+ map->mutex= 0;`
`177`	`178`	`if (!buf)`
`178`	`179`	`{`
`179`	`180`	`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,`
`183`	`184`	`size_in_bytes= ALIGN_SIZE(size_in_bytes);`
`184`	`185`	`extra= sizeof(mysql_mutex_t);`
`185`	`186`	`}`
`186`		`- map->mutex= 0;`
`187`	`187`	`if (!(buf= (my_bitmap_map*) my_malloc(size_in_bytes+extra, MYF(MY_WME))))`
`188`	`188`	`DBUG_RETURN(1);`
`189`	`189`	`if (thread_safe)`