bk commit into 5.1 tree (kent:1.2315)

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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, 2006-10-13 03:22:04+02:00, kent@stripped +2 -0
  sql_class.cc:
    Cast (byte*) to (const char *), for _db_dump_ call, Visual Studio

  sql/log_event.cc@stripped, 2006-10-13 03:18:33+02:00, kent@stripped +2 -2

  sql/sql_class.cc@stripped, 2006-10-13 03:17:44+02:00, kent@stripped +4 -4
    Cast (byte*) to (const char *), for _db_dump_ call, Visual Studio

# 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:	kent
# Host:	c-584072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-release

--- 1.246/sql/log_event.cc	2006-10-13 03:22:50 +02:00
+++ 1.247/sql/log_event.cc	2006-10-13 03:22:50 +02:00
@@ -7129,8 +7129,8 @@
                     row_start, &m_cols, row_end, &m_master_reclength,
                     table->write_set, UPDATE_ROWS_EVENT);
 
-  DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
-  DBUG_DUMP("m_after_image", m_after_image, table->s->reclength);
+  DBUG_DUMP("record[0]", (const char *)table->record[0], table->s->reclength);
+  DBUG_DUMP("m_after_image", (const char *)m_after_image, table->s->reclength);
 
 
   /*

--- 1.293/sql/sql_class.cc	2006-10-13 03:22:50 +02:00
+++ 1.294/sql/sql_class.cc	2006-10-13 03:22:50 +02:00
@@ -2632,10 +2632,10 @@
   my_size_t const after_size= pack_row(table, cols, after_row, 
                                        after_record);
   
-  DBUG_DUMP("before_record", before_record, table->s->reclength);
-  DBUG_DUMP("after_record", after_record, table->s->reclength);
-  DBUG_DUMP("before_row", before_row, before_size);
-  DBUG_DUMP("after_row", after_row, after_size);
+  DBUG_DUMP("before_record", (const char *)before_record, table->s->reclength);
+  DBUG_DUMP("after_record", (const char *)after_record, table->s->reclength);
+  DBUG_DUMP("before_row", (const char *)before_row, before_size);
+  DBUG_DUMP("after_row", (const char *)after_row, after_size);
 
   Rows_log_event* const ev=
     binlog_prepare_pending_rows_event(table, server_id, cols, colcnt,