bzr push into mysql-5.1 branch (kristofer.pettersson:2771 to 2772) Bug#39451

[Kristofer Pettersson]

 2772 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

 2771 kent.boortz@stripped	2008-10-10
      Raise version number after cloning 5.1.29-rc
modified:
  configure.in

=== 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);