From 1104d4c56286f32203559514568b45730170a838 Mon Sep 17 00:00:00 2001 From: "tomas@poseidon.ndb.mysql.com" <> Date: Wed, 13 Jul 2005 01:25:36 +0200 Subject: [PATCH] post merge fixes --- mysys/my_bitmap.c | 4 ++-- sql/mysql_priv.h | 2 +- sql/sql_insert.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c index 6cfabad1d3b..490a476691d 100644 --- a/mysys/my_bitmap.c +++ b/mysys/my_bitmap.c @@ -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); diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 122ac08c389..fc733fe74c1 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -907,7 +907,7 @@ bool setup_fields(THD *thd, Item** ref_pointer_array, List &item, ulong set_query_id, List *sum_func_list, bool allow_sum_func); inline bool setup_fields_with_no_wrap(THD *thd, Item **ref_pointer_array, - List &item, bool set_query_id, + List &item, ulong set_query_id, List *sum_func_list, bool allow_sum_func) { diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 2c1d481e104..46cc73d36cd 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -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");