after merge fixes

mysql-test/r/fulltext.result:
  after merge - test results updated
sql/sql_class.cc:
  protection
This commit is contained in:
unknown 2005-03-09 19:22:30 +01:00
commit d1b3c64b23
6 changed files with 14 additions and 9 deletions

View file

@ -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)