diff options
| author | pem@mysql.comhem.se <> | 2005-02-28 16:34:02 +0100 |
|---|---|---|
| committer | pem@mysql.comhem.se <> | 2005-02-28 16:34:02 +0100 |
| commit | 07a87c9887740f2e59944ff017357b00a5cc1919 (patch) | |
| tree | 4b058422af9097c023fb297e1956eb32b7d22588 /sql/sql_repl.cc | |
| parent | 21ca91aac6ed60571e9ccfe3af02c6bc32acd1f7 (diff) | |
| download | mariadb-git-07a87c9887740f2e59944ff017357b00a5cc1919.tar.gz | |
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.
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 5 |
1 files changed, 4 insertions, 1 deletions
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<Item> 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); } |