diff options
| author | unknown <monty@mysql.com> | 2005-02-28 22:27:55 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-02-28 22:27:55 +0200 |
| commit | ef7570c72bba3aae4867749659cbbf1e0de809f3 (patch) | |
| tree | b4dd80a68aeaf9eb6bd8da03e9f050d44a81ec61 /sql/sql_repl.cc | |
| parent | 1b002905b70f375cb5f5a264c1721bba3047007c (diff) | |
| parent | 8400a5a4a83955a3f16dafbce066468398e03c4d (diff) | |
| download | mariadb-git-ef7570c72bba3aae4867749659cbbf1e0de809f3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/sql_repl.cc:
Auto merged
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 8c486566fa6..95417c9face 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); } |