summaryrefslogtreecommitdiff
path: root/mysys/my_bitmap.c
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2001-12-13 17:21:04 -0700
committersasha@mysql.sashanet.com <>2001-12-13 17:21:04 -0700
commit0d67738e20fbe3634b166f2333df7555e5de7d1d (patch)
tree3f8b7cec7cee300f00423ae447fa93847a222d55 /mysys/my_bitmap.c
parent9db9b463d688d46e8e197915a0ebf5128bfe3757 (diff)
downloadmariadb-git-0d67738e20fbe3634b166f2333df7555e5de7d1d.tar.gz
misc cleanup
Diffstat (limited to 'mysys/my_bitmap.c')
-rw-r--r--mysys/my_bitmap.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c
index ba0a5df95c6..6bab35eabb1 100644
--- a/mysys/my_bitmap.c
+++ b/mysys/my_bitmap.c
@@ -51,8 +51,8 @@ my_bool bitmap_init(MY_BITMAP *map, uint bitmap_size, my_bool thread_safe)
return 1;
dbug_assert(bitmap_size != ~(uint) 0);
#ifdef THREAD
- map->thread_safe = thread_safe;
- pthread_mutex_init(&map->mutex, MY_MUTEX_INIT_FAST);
+ if ((map->thread_safe = thread_safe))
+ pthread_mutex_init(&map->mutex, MY_MUTEX_INIT_FAST);
#endif
map->bitmap_size=bitmap_size;
return 0;
@@ -65,7 +65,8 @@ void bitmap_free(MY_BITMAP *map)
my_free((char*) map->bitmap, MYF(0));
map->bitmap=0;
#ifdef THREAD
- pthread_mutex_destroy(&map->mutex);
+ if (map->thread_safe)
+ pthread_mutex_destroy(&map->mutex);
#endif
}
}