diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-07-29 13:43:34 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-07-29 13:43:34 +0400 |
| commit | 4028d6ea1e502c8cab1bab80216193d40ec8ba9a (patch) | |
| tree | 392482e50ca6ab4d828672da8aa5721919eda571 /mysys | |
| parent | 6b6c172454855d3c1d67f50188253b3b804902fb (diff) | |
| parent | 608d7e927fae5c8822d1bf716be107832ada7ea6 (diff) | |
| download | mariadb-git-4028d6ea1e502c8cab1bab80216193d40ec8ba9a.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
configure.in:
Auto merged
man/Makefile.am:
Auto merged
mysys/my_bitmap.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
sql/sql_locale.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/t/mysqlbinlog.test:
Manual merge.
sql/sql_select.cc:
Manual merge.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_bitmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c index 49c23aaeae5..3a83372b637 100644 --- a/mysys/my_bitmap.c +++ b/mysys/my_bitmap.c @@ -159,7 +159,7 @@ uint bitmap_set_next(MY_BITMAP *map) { uchar *bitmap=map->bitmap; uint bit_found = MY_BIT_NONE; - uint bitmap_size=map->bitmap_size*8; + uint bitmap_size=map->bitmap_size; uint i; DBUG_ASSERT(map->bitmap); |