summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <cbell/Chuck@mysql_cab.>2006-11-01 11:52:32 -0500
committerunknown <cbell/Chuck@mysql_cab.>2006-11-01 11:52:32 -0500
commit70111f50c90a85716ad528c56eee1bc2b3029aad (patch)
tree2ac68df2ec2b990a80d9d7c7c4e8a53ec7ede429
parentf004118079e1837bb88c4a9b4c28369a0f2bd362 (diff)
downloadmariadb-git-70111f50c90a85716ad528c56eee1bc2b3029aad.tar.gz
Changes to the code are necessary to compile on Windows. Typecasts are needed in several DBUG_DUMP statements. CAB 01 Nov 2006
sql/log_event.cc: The changes are so that the code will compile on Windows. Typecasts are needed on the DBUG_DUMP statements to cast a byte * to a char *. sql/sql_class.cc: The changes are necessary to get the code to compile on Windows. The DBUG_DUMP statements need a typecast.
-rw-r--r--sql/log_event.cc4
-rw-r--r--sql/sql_class.cc8
2 files changed, 6 insertions, 6 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 4a6346bf57c..d48662f13bf 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -7129,8 +7129,8 @@ int Update_rows_log_event::do_prepare_row(THD *thd, RELAY_LOG_INFO *rli,
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]", (char *)table->record[0], table->s->reclength);
+ DBUG_DUMP("m_after_image", (char *)m_after_image, table->s->reclength);
/*
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 3fd0e621422..cf2e462cb68 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -2632,10 +2632,10 @@ int THD::binlog_update_row(TABLE* table, bool is_trans,
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", (char *)before_record, table->s->reclength);
+ DBUG_DUMP("after_record", (char *)after_record, table->s->reclength);
+ DBUG_DUMP("before_row", (char *)before_row, before_size);
+ DBUG_DUMP("after_row", (char *)after_row, after_size);
Rows_log_event* const ev=
binlog_prepare_pending_rows_event(table, server_id, cols, colcnt,