summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_bitmap.c12
-rw-r--r--mysys/my_init.c1
2 files changed, 5 insertions, 8 deletions
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c
index 2601aa96727..b4990816b56 100644
--- a/mysys/my_bitmap.c
+++ b/mysys/my_bitmap.c
@@ -27,9 +27,7 @@
#include <my_bitmap.h>
#include <assert.h>
-pthread_mutex_t LOCK_bitmap;
-
-my_bool bitmap_init(BITMAP *map, uint bitmap_size)
+my_bool bitmap_init(MY_BITMAP *map, uint bitmap_size)
{
if (!(map->bitmap=(uchar*) my_malloc((bitmap_size+7)/8,MYF(MY_WME))))
return 1;
@@ -41,7 +39,7 @@ my_bool bitmap_init(BITMAP *map, uint bitmap_size)
return 0;
}
-void bitmap_free(BITMAP *map)
+void bitmap_free(MY_BITMAP *map)
{
if (map->bitmap)
{
@@ -53,7 +51,7 @@ void bitmap_free(BITMAP *map)
}
}
-void bitmap_set_bit(BITMAP *map, uint bitmap_bit)
+void bitmap_set_bit(MY_BITMAP *map, uint bitmap_bit)
{
if (bitmap_bit < map->bitmap_size)
{
@@ -64,7 +62,7 @@ void bitmap_set_bit(BITMAP *map, uint bitmap_bit)
}
-uint bitmap_set_next(BITMAP *map)
+uint bitmap_set_next(MY_BITMAP *map)
{
uchar *bitmap=map->bitmap;
uint bit_found = MY_BIT_NONE;
@@ -94,7 +92,7 @@ uint bitmap_set_next(BITMAP *map)
}
-void bitmap_clear_bit(BITMAP *map, uint bitmap_bit)
+void bitmap_clear_bit(MY_BITMAP *map, uint bitmap_bit)
{
if (bitmap_bit < map->bitmap_size)
{
diff --git a/mysys/my_init.c b/mysys/my_init.c
index 62e48deb6a1..225b3115fbe 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -168,7 +168,6 @@ Voluntary context switches %ld, Involuntary context switches %ld\n",
pthread_mutex_destroy(&THR_LOCK_keycache);
pthread_mutex_destroy(&THR_LOCK_malloc);
pthread_mutex_destroy(&THR_LOCK_open);
- pthread_mutex_destroy(&LOCK_bitmap);
DBUG_POP(); /* Must be done before my_thread_end */
my_thread_end();
my_thread_global_end();