From d49913877064778d8301c7bbd610238b3f5422cd Mon Sep 17 00:00:00 2001
From: Alexander Nozdrin <alik@sun.com>
Date: Wed, 23 Sep 2009 17:10:23 +0400
Subject: A patch for Bug#47474 (mysqld hits Dbug_violation_helper assert when
 compiled with Sun Studio compiler).

The thing is that Sun Studio compiler calls destructor of stack
objects when pthread_exit() is called. That triggered an assertion
in DBUG_ENTER()/DBUG_RETURN() validation logic (if DBUG_ENTER() is
used in the beginning of function, all returns should be replaced
by DBUG_RETURN/DBUG_VOID_RETURN macros).

A fix is to explicitly use DBUG_LEAVE macro.
---
 sql/repl_failsafe.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sql/repl_failsafe.cc')

diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc
index 582348608de..312499bb4ee 100644
--- a/sql/repl_failsafe.cc
+++ b/sql/repl_failsafe.cc
@@ -638,9 +638,11 @@ err:
   if (recovery_captain)
     mysql_close(recovery_captain);
   delete thd;
+
+  DBUG_LEAVE;                                   // Must match DBUG_ENTER()
   my_thread_end();
   pthread_exit(0);
-  DBUG_RETURN(0);
+  return 0;                                     // Avoid compiler warnings
 }
 #endif
 
-- 
cgit v1.2.1