mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Better fix for bug #791: At binlog rotation, INSERTs may not find their way into the binlog
mysql-test/t/rpl_flush_log_loop.test: Add timer to avoid problem when 'flush logs' is executed before we have read all data from master sql/log.cc: Better fix for bug #791: Mark log as LOG_TO_BE_OPENED instead of LOG_CLOSED when it's closed and opened. sql/mysqld.cc: Better startup message sql/slave.cc: Fix argument to close() sql/sql_class.h: Better handling of log.close()
This commit is contained in:
@ -1314,7 +1314,7 @@ file '%s')", fname);
|
||||
if (info_fd >= 0)
|
||||
my_close(info_fd, MYF(0));
|
||||
rli->info_fd= -1;
|
||||
rli->relay_log.close(1);
|
||||
rli->relay_log.close(LOG_CLOSE_INDEX | LOG_CLOSE_STOP_EVENT);
|
||||
pthread_mutex_unlock(&rli->data_lock);
|
||||
DBUG_RETURN(1);
|
||||
}
|
||||
@ -1374,7 +1374,7 @@ err:
|
||||
if (info_fd >= 0)
|
||||
my_close(info_fd, MYF(0));
|
||||
rli->info_fd= -1;
|
||||
rli->relay_log.close(1);
|
||||
rli->relay_log.close(LOG_CLOSE_INDEX | LOG_CLOSE_STOP_EVENT);
|
||||
pthread_mutex_unlock(&rli->data_lock);
|
||||
DBUG_RETURN(1);
|
||||
}
|
||||
@ -2989,7 +2989,7 @@ void end_relay_log_info(RELAY_LOG_INFO* rli)
|
||||
rli->cur_log_fd = -1;
|
||||
}
|
||||
rli->inited = 0;
|
||||
rli->relay_log.close(1);
|
||||
rli->relay_log.close(LOG_CLOSE_INDEX | LOG_CLOSE_STOP_EVENT);
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user