diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-01-15 14:26:53 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-01-15 14:26:53 +0300 |
| commit | 0a5b406fc54a16ac266cd6d38953b19af3feed30 (patch) | |
| tree | 50764a5d381794b53bd844836e2ae9c962816860 /sql/sql_repl.cc | |
| parent | e6e3b4abc3cb1b0b92dc862810d5571b8b20397f (diff) | |
| parent | 0305aea88a220ff9080432a65d50cb30493f3109 (diff) | |
| download | mariadb-git-0a5b406fc54a16ac266cd6d38953b19af3feed30.tar.gz | |
Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
Text conflict in mysql-test/t/mysqlbinlog.test
Text conflict in sql/sql_acl.cc
Text conflict in sql/sql_servers.cc
Text conflict in sql/sql_update.cc
Text conflict in support-files/mysql.spec.sh
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 4e5ce08ab5d..f87ba412223 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -923,11 +923,14 @@ impossible position"; thd_proc_info(thd, "Finished reading one binlog; switching to next binlog"); switch (mysql_bin_log.find_next_log(&linfo, 1)) { - case LOG_INFO_EOF: - loop_breaker = (flags & BINLOG_DUMP_NON_BLOCK); - break; case 0: break; + case LOG_INFO_EOF: + if (mysql_bin_log.is_active(log_file_name)) + { + loop_breaker = (flags & BINLOG_DUMP_NON_BLOCK); + break; + } default: errmsg = "could not find next log"; my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG; |