summaryrefslogtreecommitdiff
path: root/mysys/my_bitmap.c
diff options
context:
space:
mode:
authorunknown <monty@mishka.local>2005-07-18 19:03:01 +0300
committerunknown <monty@mishka.local>2005-07-18 19:03:01 +0300
commit5b6c1348c737ddf705800c3f734c25349d0ca841 (patch)
tree2a23167b636e05bfda983614bbee36653c7c2c12 /mysys/my_bitmap.c
parentabde46de62241a722f4e17d2b1d820d1d496b582 (diff)
parent68b4d7b74d80062b09edfdaeb7137c74b3071346 (diff)
downloadmariadb-git-5b6c1348c737ddf705800c3f734c25349d0ca841.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0 client/mysqldump.c: Auto merged include/my_sys.h: Auto merged mysys/Makefile.am: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged tests/mysql_client_test.c: Auto merged sql/sql_select.cc: Auto merged mysys/default.c: SCCS merged
Diffstat (limited to 'mysys/my_bitmap.c')
-rw-r--r--mysys/my_bitmap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c
index ba958b234d2..c70c0fa0754 100644
--- a/mysys/my_bitmap.c
+++ b/mysys/my_bitmap.c
@@ -152,6 +152,7 @@ my_bool bitmap_test_and_set(MY_BITMAP *map, uint bitmap_bit)
bitmap_lock(map);
res= bitmap_fast_test_and_set(map, bitmap_bit);
bitmap_unlock(map);
+ return res;
}
uint bitmap_set_next(MY_BITMAP *map)