bk commit into 5.1 tree (iggy:1.2576) BUG#27691

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.1 repository of iggy. When iggy 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@stripped, 2007-04-23 16:42:57-04:00, iggy@recycle.(none) +1 -0
  Bug #27691 bk compilation with VC++ 2005 fails
  - Added appropiate casts.

  sql/log_event.cc@stripped, 2007-04-23 16:42:55-04:00, iggy@recycle.(none) +5 -5
    Bug #27691 bk compilation with VC++ 2005 fails
    - Add appropiate casts.

# 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:	iggy
# Host:	recycle.(none)
# Root:	/src/mysql-5.1-maint_27691

--- 1.276/sql/log_event.cc	2007-04-20 04:46:39 -04:00
+++ 1.277/sql/log_event.cc	2007-04-23 16:42:55 -04:00
@@ -6260,7 +6260,7 @@ bool Rows_log_event::write_data_body(IO_
                                 reinterpret_cast<byte*>(m_cols_ai.bitmap),
                                 no_bytes_in_map(&m_cols_ai));
   }
-  DBUG_DUMP("rows", m_rows_buf, data_size);
+  DBUG_DUMP("rows",(const char *) m_rows_buf, data_size);
   res= res || my_b_safe_write(file, m_rows_buf, (uint) data_size);
 
   return res;
@@ -6979,7 +6979,7 @@ replace_record(THD *thd, TABLE *table,
   auto_afree_ptr<char> key(NULL);
 
 #ifndef DBUG_OFF
-  DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
+  DBUG_DUMP("record[0]",(const char *) table->record[0], table->s->reclength);
   DBUG_PRINT_BITSET("debug", "write_set = %s", table->write_set);
   DBUG_PRINT_BITSET("debug", "read_set = %s", table->read_set);
 #endif
@@ -7221,7 +7221,7 @@ static int find_and_fetch_row(TABLE *tab
 
   DBUG_ASSERT(table->in_use != NULL);
 
-  DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
+  DBUG_DUMP("record[0]",(const char *) table->record[0], table->s->reclength);
 
   if ((table->file->ha_table_flags() & HA_PRIMARY_KEY_REQUIRED_FOR_POSITION) &&
       table->s->primary_key < MAX_KEY)
@@ -7365,8 +7365,8 @@ static int find_and_fetch_row(TABLE *tab
     {
       error= table->file->rnd_next(table->record[1]);
 
-      DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
-      DBUG_DUMP("record[1]", table->record[1], table->s->reclength);
+      DBUG_DUMP("record[0]",(const char *) table->record[0], table->s->reclength);
+      DBUG_DUMP("record[1]",(const char *) table->record[1], table->s->reclength);
 
       switch (error)
       {