diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-05 15:05:37 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-05 15:05:37 +0300 |
| commit | 1a0f34e6a4e38476ecdbd354c8b213ba838ed37d (patch) | |
| tree | 0bf2d7fce335a1c38da55def00c6bfc5304db2ee /sql/sql_repl.cc | |
| parent | 30b561b3c91f2ca05336b88b34a02efb0f7c8472 (diff) | |
| parent | 9ee5543be93cddfdf0b524763c1c1b6a163c4f07 (diff) | |
| download | mariadb-git-1a0f34e6a4e38476ecdbd354c8b213ba838ed37d.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sys_vars.cc
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 fe3f17f57a0..510f9d8dc01 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -917,11 +917,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; |