From b532dbeaa337031687d8d3f3e3bbd215b6607b32 Mon Sep 17 00:00:00 2001
From: "kent.boortz@sun.com" <>
Date: Fri, 10 Oct 2008 13:54:46 +0200
Subject: [PATCH 1/2] Raise version number after cloning 5.1.29-rc

---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 4c98b2b6dc8..c75bd617f8f 100644
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
 #
 # When changing major version number please also check switch statement
 # in mysqlbinlog::check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.1.29)
+AM_INIT_AUTOMAKE(mysql, 5.1.30)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10

From 3c76b5a10405a019422a6617be8e6b22a8da8953 Mon Sep 17 00:00:00 2001
From: Kristofer Pettersson <kristofer.pettersson@sun.com>
Date: Tue, 21 Oct 2008 14:18:38 +0200
Subject: [PATCH 2/2] 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 8ab2e892b27..fb8669a5731 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 abbb2de0a82..e63eed2d23c 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);