database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +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

4
sql/rpl_rli.cc
View File

@@ -993,7 +993,6 @@ void Relay_log_info::inc_group_relay_log_pos(ulonglong log_pos,
if (cmp < 0)
{
strcpy(group_master_log_name, rgi->future_event_master_log_name);
notify_group_master_log_name_update();
group_master_log_pos= log_pos;
}
else if (group_master_log_pos < log_pos)
@@ -1209,7 +1208,8 @@ bool Relay_log_info::is_until_satisfied(my_off_t master_beg_pos)
if (until_condition == UNTIL_MASTER_POS)
{
log_name= group_master_log_name;
log_name= (mi->using_parallel() ?
future_event_master_log_name : group_master_log_name);
log_pos= master_beg_pos;
}
else