diff options
| author | unknown <sergefp@mysql.com> | 2004-06-14 11:18:56 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-06-14 11:18:56 +0400 |
| commit | d554ef09910724af80761ca956ba5e2726668169 (patch) | |
| tree | cb100affefa471904e7555d307bab15072bae4f6 /mysys/my_bit.c | |
| parent | 2163546955bf3ecd70080b06b20ac4076559473e (diff) | |
| parent | cb3848b91545e494af32dab6744e2dc59bde98bf (diff) | |
| download | mariadb-git-d554ef09910724af80761ca956ba5e2726668169.tar.gz | |
Manual merge
include/my_base.h:
Auto merged
include/my_bitmap.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysys/my_bitmap.c:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_select.h:
Auto merged
Diffstat (limited to 'mysys/my_bit.c')
| -rw-r--r-- | mysys/my_bit.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysys/my_bit.c b/mysys/my_bit.c index 55dd72f5f76..01c9b5ea68d 100644 --- a/mysys/my_bit.c +++ b/mysys/my_bit.c @@ -71,3 +71,8 @@ uint my_count_bits(ulonglong v) #endif } +uint my_count_bits_ushort(ushort v) +{ + return nbits[v]; +} + |