post merge fixes

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);

sql/mysql_priv.h

@@ -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)
 {

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");