summaryrefslogtreecommitdiff
path: root/sql/sql_repl.cc
diff options
context:
space:
mode:
authorunknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>2007-07-05 13:09:56 +0500
committerunknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>2007-07-05 13:09:56 +0500
commit0d8f353b93f511b99e0f0ac79c3d48cd462186ff (patch)
tree647dea64d057136a3050b03c919c62d5dc3823d7 /sql/sql_repl.cc
parent0b5daef995f8d38501f3816784bb5e85588e02ed (diff)
downloadmariadb-git-0d8f353b93f511b99e0f0ac79c3d48cd462186ff.tar.gz
Fix for bug #29420: crash with show and purge binlogs
Problem: in case of failed 'show binlog events...' we don't inform that the log is not in use anymore. That may confuse following 'purge logs...' command as it takes into account logs in use. Fix: always notify that the log is not in use anymore. mysql-test/r/rpl_rotate_logs.result: Fix for bug #29420: crash with show and purge binlogs - test result. mysql-test/t/rpl_rotate_logs.test: Fix for bug #29420: crash with show and purge binlogs - test case. sql/sql_repl.cc: Fix for bug #29420: crash with show and purge binlogs - always zero thd->current_linfo at the end of the mysql_show_binlog_events().
Diffstat (limited to 'sql/sql_repl.cc')
-rw-r--r--sql/sql_repl.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index 86ededd5587..9cc0ba7c29a 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -1420,13 +1420,11 @@ err:
}
if (errmsg)
- {
my_error(ER_ERROR_WHEN_EXECUTING_COMMAND, MYF(0),
"SHOW BINLOG EVENTS", errmsg);
- DBUG_RETURN(TRUE);
- }
+ else
+ send_eof(thd);
- send_eof(thd);
pthread_mutex_lock(&LOCK_thread_count);
thd->current_linfo = 0;
pthread_mutex_unlock(&LOCK_thread_count);