bk commit into 5.0 tree (kroki:1.2220)

[kroki]

Below is the list of changes that have just been committed into a local
5.0 repository of tomash. When tomash does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-27 14:43:28+04:00, kroki@stripped +1 -0
  Revert the change after null-merge.

  mysys/my_bitmap.c@stripped, 2006-07-27 14:43:25+04:00, kroki@stripped +2 -2
    Revert the change forced during null-merge.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kroki
# Host:	moonlight.intranet
# Root:	/home/tomash/src/mysql_ab/mysql-5.0-main

--- 1.31/mysys/my_bitmap.c	2006-07-27 14:43:35 +04:00
+++ 1.32/mysys/my_bitmap.c	2006-07-27 14:43:35 +04:00
@@ -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;
+  uint bitmap_size=map->bitmap_size*8;
   uint i;
 
   DBUG_ASSERT(map->bitmap);
@@ -445,7 +445,7 @@ uint bitmap_get_first(const MY_BITMAP *m
 {
   uchar *bitmap=map->bitmap;
   uint bit_found = MY_BIT_NONE;
-  uint bitmap_size=map->bitmap_size;
+  uint bitmap_size=map->bitmap_size*8;
   uint i;
 
   DBUG_ASSERT(map->bitmap);