Merge main 5.1 -> 5.1-build

43b1027c · Joerg Bruehe · 5d4e10c3 · 3c76b5a1 · 43b1027c · 43b1027c
Commit 43b1027c authored Oct 23, 2008 by Joerg Bruehe
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/log.cc sql/log.cc +1 -1

sql/sql_class.cc sql/sql_class.cc +1 -1

No files found.
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -3779,7 +3779,7 @@ THD::binlog_set_pending_rows_event(Rows_log_event* ev)
 int
 MYSQL_BIN_LOG::remove_pending_rows_event(THD *thd)
 {
-  DBUG_ENTER(__FUNCTION__);
+  DBUG_ENTER("MYSQL_BIN_LOG::remove_pending_rows_event");

  binlog_trx_data *const trx_data=
    (binlog_trx_data*) thd_get_ha_data(thd, binlog_hton);

--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -3513,7 +3513,7 @@ int THD::binlog_delete_row(TABLE* table, bool is_trans,

 int THD::binlog_remove_pending_rows_event(bool clear_maps)
 {
-  DBUG_ENTER(__FUNCTION__);
+  DBUG_ENTER("THD::binlog_remove_pending_rows_event");

  if (!mysql_bin_log.is_open())
    DBUG_RETURN(0);