summaryrefslogtreecommitdiff
path: root/mysys/my_bitmap.c
diff options
context:
space:
mode:
authorkonstantin@mysql.com <>2006-02-02 16:57:34 +0300
committerkonstantin@mysql.com <>2006-02-02 16:57:34 +0300
commit92b41ba92a022e86127481f2f4a90849feb93114 (patch)
tree8b45ee033b876bd5d51ce4afe7627ae87815b79c /mysys/my_bitmap.c
parent065f8066d5de10cf998b02d0e02216f61d87e9db (diff)
parent87f685edef5bd97ab8099d0ae6dcf2fa3ddd871b (diff)
downloadmariadb-git-92b41ba92a022e86127481f2f4a90849feb93114.tar.gz
Merge mysql.com:/home/kostja/mysql/tmp_merge
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
Diffstat (limited to 'mysys/my_bitmap.c')
-rw-r--r--mysys/my_bitmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c
index b4865557d80..91575d66368 100644
--- a/mysys/my_bitmap.c
+++ b/mysys/my_bitmap.c
@@ -114,7 +114,7 @@ my_bool bitmap_init(MY_BITMAP *map, uint32 *buf, uint n_bits,
#endif
;
if (!(buf= (uint32*) my_malloc(size_in_bytes, MYF(MY_WME))))
- return 1;
+ DBUG_RETURN(1);
}
#ifdef THREAD
else