misc cleanup

Docs/manual.texi:
  fixed bad merge
include/my_bitmap.h:
  fixed comment format
mysql-test/r/rpl_get_lock.result:
  make the test results predicable
mysql-test/t/rpl_get_lock.test:
  predicatable test results
mysys/my_bitmap.c:
  do not init/destroy mutex if bitmap is not declared thread safe
sql/slave.cc:
  clean-up suggested by Monty to make init_slave_skip_errors() more compact
This commit is contained in:
unknown 2001-12-13 17:21:04 -07:00
commit 601b545eed
6 changed files with 23 additions and 31 deletions

View file

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