mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

post merge fixes

Browse source
This commit is contained in:
unknown 2005-07-13 01:25:36 +02:00
parent e4be45da93
commit e5ca715548
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysys/my_bitmap.c
View file

@ -174,7 +174,7 @@ void bitmap_free(MY_BITMAP *map)
my_bool bitmap_fast_test_and_set(MY_BITMAP *map, uint bitmap_bit)
{
uchar *byte= map->bitmap + (bitmap_bit / 8);
uchar *byte= (uchar*)map->bitmap + (bitmap_bit / 8);
uchar bit= 1 << ((bitmap_bit) & 7);
uchar res= (*byte) & bit;
*byte|= bit;
@ -198,7 +198,7 @@ my_bool bitmap_fast_test_and_set(MY_BITMAP *map, uint bitmap_bit)
my_bool bitmap_test_and_set(MY_BITMAP *map, uint bitmap_bit)
{
my_bool res;
DBUG_ASSERT(map->bitmap && bitmap_bit < map->bitmap_size*8);
DBUG_ASSERT(map->bitmap && bitmap_bit < map->n_bits);
bitmap_lock(map);
res= bitmap_fast_test_and_set(map, bitmap_bit);
bitmap_unlock(map);

2
sql/mysql_priv.h
View file

@ -907,7 +907,7 @@ bool setup_fields(THD *thd, Item** ref_pointer_array,
List<Item> &item, ulong set_query_id,
List<Item> *sum_func_list, bool allow_sum_func);
inline bool setup_fields_with_no_wrap(THD *thd, Item **ref_pointer_array,
List<Item> &item, bool set_query_id,
List<Item> &item, ulong set_query_id,
List<Item> *sum_func_list,
bool allow_sum_func)
{

2
sql/sql_insert.cc
View file

@ -650,7 +650,7 @@ static bool check_view_insertability(THD * thd, TABLE_LIST *view)
Field_translator *trans;
Field **field_ptr= table->field;
uint used_fields_buff_size= (table->s->fields + 7) / 8;
uchar *used_fields_buff= (uchar*)thd->alloc(used_fields_buff_size);
uint32 *used_fields_buff= (uint32*)thd->alloc(used_fields_buff_size);
MY_BITMAP used_fields;
DBUG_ENTER("check_key_in_view");