From 74a74cbe49283526ca53defbc075c0b9930fc6bc Mon Sep 17 00:00:00 2001
From: Kristofer Pettersson <kristofer.pettersson@sun.com>
Date: Fri, 10 Oct 2008 13:00:27 +0200
Subject: [PATCH] Bug#39451 Debug builds broken with Sun Studio compiler

Debug builds of MySQL 5.1, 6.0 with Sun Studio 12 broke because of
use of gcc specific feature.

The fix is to replace __FUNCTION__ with the corresponding character
string
---
 sql/log.cc       | 2 +-
 sql/sql_class.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/log.cc b/sql/log.cc
index 7775fb44b65..7401737b6e4 100644
--- 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);
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index c4a4312ad85..68972c9cf97 100644
--- 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);