bzr push into mysql-6.0 branch (kristofer.pettersson:2736 to 2737) Bug#39451

[Kristofer Pettersson]

 2737 Kristofer Pettersson	2008-10-21
      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.
modified:
  sql/log.cc
  sql/sql_class.cc

 2736 Alexander Nozdrin	2008-10-20 [merge]
      Pull from 6.0
modified:
  libmysql/Makefile.am
  libmysql/Makefile.shared
  sql/Makefile.am
  sql/filesort.cc
  sql/handler.cc
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/net_serv.cc
  sql/probes.d
  sql/probes.h
  sql/scheduler.cc
  sql/sp_head.cc
  sql/sql_cache.cc
  sql/sql_connect.cc
  sql/sql_cursor.cc
  sql/sql_delete.cc
  sql/sql_insert.cc
  sql/sql_parse.cc
  sql/sql_prepare.cc
  sql/sql_select.cc
  sql/sql_update.cc

=== modified file 'sql/log.cc'
--- a/sql/log.cc	2008-10-16 14:30:35 +0000
+++ b/sql/log.cc	2008-10-21 12:38:13 +0000
@@ -5131,7 +5131,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:29:55 +0000
+++ b/sql/sql_class.cc	2008-10-21 12:38:13 +0000
@@ -3517,7 +3517,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);