bk commit into 5.1 tree (tomas:1.1847)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1847 05/07/13 01:25:36 tomas@stripped +3 -0
  post merge fixes

  sql/sql_insert.cc
    1.161 05/07/13 01:25:29 tomas@stripped +1 -1
    post merge fixes

  sql/mysql_priv.h
    1.314 05/07/13 01:25:29 tomas@stripped +1 -1
    post merge fixes

  mysys/my_bitmap.c
    1.33 05/07/13 01:25:29 tomas@stripped +2 -2
    post merge fixes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1

--- 1.313/sql/mysql_priv.h	2005-07-12 19:23:22 +02:00
+++ 1.314/sql/mysql_priv.h	2005-07-13 01:25:29 +02:00
@@ -907,7 +907,7 @@
                   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)
 {

--- 1.160/sql/sql_insert.cc	2005-07-12 19:54:28 +02:00
+++ 1.161/sql/sql_insert.cc	2005-07-13 01:25:29 +02:00
@@ -650,7 +650,7 @@
   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");
 

--- 1.32/mysys/my_bitmap.c	2005-07-12 19:38:08 +02:00
+++ 1.33/mysys/my_bitmap.c	2005-07-13 01:25:29 +02:00
@@ -174,7 +174,7 @@
 
 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_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);