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

Merge MDEV-8193 into 10.1

Browse Source 
Conflicts:
	sql/rpl_rli.cc
This commit is contained in:
Kristian Nielsen
2015-09-11 12:01:48 +02:00
parent 6f302d9f6c 51eaa7fe53
commit df9b8aee58
4 changed files with 83 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/rpl_parallel.cc
View File

@ -94,7 +94,6 @@ handle_queued_pos_update(THD *thd, rpl_parallel_thread::queued_event *qev)
if (cmp < 0)
{
strcpy(rli->group_master_log_name, qev->future_event_master_log_name);
rli->notify_group_master_log_name_update();
rli->group_master_log_pos= qev->future_event_master_log_pos;
}
else if (cmp == 0
@ -2110,6 +2109,7 @@ rpl_parallel::do_event(rpl_group_info *serial_rgi, Log_event *ev,
{
memcpy(rli->future_event_master_log_name,
rev->new_log_ident, rev->ident_len+1);
rli->notify_group_master_log_name_update();
}
}