Commit 1ad9b711 authored by Kristofer Pettersson's avatar Kristofer Pettersson

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
parent 32f151cd
...@@ -3779,7 +3779,7 @@ THD::binlog_set_pending_rows_event(Rows_log_event* ev) ...@@ -3779,7 +3779,7 @@ THD::binlog_set_pending_rows_event(Rows_log_event* ev)
int int
MYSQL_BIN_LOG::remove_pending_rows_event(THD *thd) 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 *const trx_data=
(binlog_trx_data*) thd_get_ha_data(thd, binlog_hton); (binlog_trx_data*) thd_get_ha_data(thd, binlog_hton);
......
...@@ -3513,7 +3513,7 @@ int THD::binlog_delete_row(TABLE* table, bool is_trans, ...@@ -3513,7 +3513,7 @@ int THD::binlog_delete_row(TABLE* table, bool is_trans,
int THD::binlog_remove_pending_rows_event(bool clear_maps) 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()) if (!mysql_bin_log.is_open())
DBUG_RETURN(0); DBUG_RETURN(0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment