database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-8469 Add RESET MASTER TO x to allow specification of binlog file nr

Browse Source 
Other things:
- Avoid calling init_and_set_log_file_name() when opening binary log.
- Remove newlines early when reading from index file.
- Ensure that reset_logs() will work even if thd is 0 (Can happen on startup)
- Added thd to sart_slave_threads() for better error handling.
This commit is contained in:
Monty
2015-07-15 16:27:14 +03:00
parent df0498fd76
commit 872a953b22
16 changed files with 186 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_reload.cc
View File

@ -334,7 +334,7 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
{
DBUG_ASSERT(thd);
tmp_write_to_binlog= 0;
if (reset_master(thd, NULL, 0))
if (reset_master(thd, NULL, 0, thd->lex->next_binlog_file_number))
{
/* NOTE: my_error() has been already called by reset_master(). */
result= 1;