bzr commit into mysql-5.1 branch (joerg:2693)

[Joerg Bruehe]

#At file:///MySQL/REPO/V51/push-5.1/

 2693 Joerg Bruehe	2008-10-23 [merge]
      Merge main 5.1 -> 5.1-build
modified:
  sql/log.cc
  sql/sql_class.cc

=== modified file 'sql/log.cc'
--- a/sql/log.cc	2008-10-08 09:15:00 +0000
+++ b/sql/log.cc	2008-10-21 12:18:38 +0000
@@ -3779,7 +3779,7 @@ THD::binlog_set_pending_rows_event(Rows_
 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);

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2008-10-08 15:25:24 +0000
+++ b/sql/sql_class.cc	2008-10-21 12:18:38 +0000
@@ -3513,7 +3513,7 @@ int THD::binlog_delete_row(TABLE* table,
 
 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);