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

2 files changed, 4 insertions, 1 deletions

diff --git a/mysql-test/r/rpl_get_lock.result b/mysql-test/r/rpl_get_lock.result
index 4cabeaf155f..84749c1a9b1 100644
--- a/mysql-test/r/rpl_get_lock.result
+++ b/mysql-test/r/rpl_get_lock.result
@@ -1,5 +1,7 @@
+get_lock("lock",2)
+1
 release_lock("lock")
-0
+1
 get_lock("lock",3)
 1
 n
diff --git a/mysql-test/t/rpl_get_lock.test b/mysql-test/t/rpl_get_lock.test
index d4b5bffc409..93f911e01d5 100644
--- a/mysql-test/t/rpl_get_lock.test
+++ b/mysql-test/t/rpl_get_lock.test
@@ -4,6 +4,7 @@ create table t1(n int);
 insert into t1 values(get_lock("lock",2));
 dirty_close master;
 connection master1;
+select get_lock("lock",2);
 select release_lock("lock");
 save_master_pos;
 connection slave;