mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge chilla.local:/home/mydev/mysql-5.1-ateam

Browse source 
into  chilla.local:/home/mydev/mysql-5.1-bug26827
This commit is contained in:
unknown 2007-07-05 11:46:40 +02:00
commit bd087a1756
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/my_bitmap.h
View file

@ -103,6 +103,17 @@ extern void bitmap_lock_invert(MY_BITMAP *map);
&= ~ (1 << ((BIT) & 7))) &= ~ (1 << ((BIT) & 7)))
#define _bitmap_is_set(MAP, BIT) (uint) (((uchar*)(MAP)->bitmap)[(BIT) / 8] \ #define _bitmap_is_set(MAP, BIT) (uint) (((uchar*)(MAP)->bitmap)[(BIT) / 8] \
& (1 << ((BIT) & 7))) & (1 << ((BIT) & 7)))
/*
WARNING!
The below symbols are inline functions in DEBUG builds and macros in
non-DEBUG builds. The latter evaluate their 'bit' argument twice.
NEVER use an increment/decrement operator with the 'bit' argument.
It would work with DEBUG builds, but fails later in production builds!
FORBIDDEN: bitmap_set_bit($my_bitmap, (field++)->field_index);
*/
#ifndef DBUG_OFF #ifndef DBUG_OFF
static inline void static inline void
bitmap_set_bit(MY_BITMAP *map,uint bit) bitmap_set_bit(MY_BITMAP *map,uint bit)

4
sql/sql_partition.cc
View file

@ -606,8 +606,8 @@ static bool create_full_part_field_array(THD *thd, TABLE *table,
partitioning. partitioning.
*/ */
if ((ptr= part_info->full_part_field_array)) if ((ptr= part_info->full_part_field_array))
while (*ptr) for (; *ptr; ptr++)
bitmap_set_bit(&part_info->full_part_field_set, (*ptr++)->field_index); bitmap_set_bit(&part_info->full_part_field_set, (*ptr)->field_index);
end: end:
DBUG_RETURN(result); DBUG_RETURN(result);