diff options
| author | unknown <serg@serg.mylan> | 2005-03-09 19:22:30 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-09 19:22:30 +0100 |
| commit | d1b3c64b230e35dccf33ac7bb70bdd52f779536b (patch) | |
| tree | f16bb48edb46705380ea8ac84c64b53a1a81b163 /mysys | |
| parent | cd4961830ef37a6c4470ec22fecdf308fc307a46 (diff) | |
| download | mariadb-git-d1b3c64b230e35dccf33ac7bb70bdd52f779536b.tar.gz | |
after merge fixes
mysql-test/r/fulltext.result:
after merge - test results updated
sql/sql_class.cc:
protection
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_bitmap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c index 462c4ec4692..c0eb6f15548 100644 --- a/mysys/my_bitmap.c +++ b/mysys/my_bitmap.c @@ -28,8 +28,8 @@ * when both arguments are bitmaps, they must be of the same size * bitmap_intersect() is an exception :) (for for Bitmap::intersect(ulonglong map2buff)) - - If THREAD is defined all bitmap operations except bitmap_init/bitmap_free + + If THREAD is defined all bitmap operations except bitmap_init/bitmap_free are thread-safe. TODO: @@ -40,6 +40,7 @@ #include <my_bitmap.h> #include <m_string.h> +static inline void bitmap_lock(MY_BITMAP *map) { #ifdef THREAD if (map->mutex) @@ -47,6 +48,7 @@ #endif } +static inline void bitmap_unlock(MY_BITMAP *map) { #ifdef THREAD if (map->mutex) |