database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Manual merge from mysql-next-mr.

Browse Source 
Conflicts:
  - sql/sys_vars.cc
This commit is contained in:
Alexander Nozdrin
2010-02-05 15:05:37 +03:00
parent 30b561b3c9 9ee5543be9
commit 1a0f34e6a4
182 changed files with 4079 additions and 883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_repl.cc
View File

@ -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;