From cfff7e6e184ab70b262ab36eaf8bee07746f87aa Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 28 Feb 2005 16:34:02 +0100 Subject: Fixed BUG#7646: Stored procedure hang if show binlog events Return false from show_binlog_events() if successful, otherwise stored procedures will think it failed. sql/sql_repl.cc: Return false from show_binlog_events() if successful, otherwise stored procedures will think it failed. --- sql/sql_repl.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sql/sql_repl.cc') diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 3b4e822a3df..80c7dba8f13 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1274,6 +1274,7 @@ bool mysql_show_binlog_events(THD* thd) DBUG_ENTER("show_binlog_events"); List field_list; const char *errmsg = 0; + bool ret = TRUE; IO_CACHE log; File file = -1; Format_description_log_event *description_event= new @@ -1376,6 +1377,8 @@ bool mysql_show_binlog_events(THD* thd) pthread_mutex_unlock(log_lock); } + ret= FALSE; + err: delete description_event; if (file >= 0) @@ -1395,7 +1398,7 @@ err: pthread_mutex_lock(&LOCK_thread_count); thd->current_linfo = 0; pthread_mutex_unlock(&LOCK_thread_count); - DBUG_RETURN(TRUE); + DBUG_RETURN(ret); } -- cgit v1.2.1