diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-07-07 12:04:11 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-07-07 12:04:11 +0500 |
| commit | 5c604181043035c3d3750180e821a85274517238 (patch) | |
| tree | df7cbe7db57241346531e0de90529a2c8d4640f5 /sql/sql_repl.cc | |
| parent | 558aeb0f0bfd83726ffe84f5739c0317df48980c (diff) | |
| parent | 0d8f353b93f511b99e0f0ac79c3d48cd462186ff (diff) | |
| download | mariadb-git-5c604181043035c3d3750180e821a85274517238.tar.gz | |
Merge mysql.com:/home/ram/work/b29420/b29420.5.0
into mysql.com:/home/ram/work/b29420/b29420.5.1
sql/sql_repl.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_rotate_logs.result:
Auto merged
mysql-test/suite/rpl/t/rpl_rotate_logs.test:
Auto merged
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 1616e895107..5d9d30b6020 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1442,13 +1442,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); |