Commit 350cc461 authored by unknown's avatar unknown
Browse files

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-release 

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main


sql/sql_select.cc:
  Null-merge
tests/mysql_client_test.c:
  Null-merge
parents a6557b0c 7dbd43b1

mysys/my_bitmap.c

+2 −2
Original line number Diff line number Diff line
@@ -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);
@@ -445,7 +445,7 @@ uint bitmap_get_first(const 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);