diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-02-01 13:49:33 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-02-01 13:49:33 +0100 |
| commit | 60ea09eae6f464e8ec483f4d31f7b910a8451c28 (patch) | |
| tree | 7b79f55a96c8bc9dc3f0353cc08f43b825fe8707 /sql/rpl_rli.cc | |
| parent | 59eda73eff1a22ac0373d818bc802c05e82b5449 (diff) | |
| parent | ff5186fd2b1ed06ed40fe3d817b41326e3f943d5 (diff) | |
| download | mariadb-git-60ea09eae6f464e8ec483f4d31f7b910a8451c28.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 2218dfc76c2..58594f6f645 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -993,7 +993,7 @@ void Relay_log_info::inc_group_relay_log_pos(ulonglong log_pos, if (rgi->is_parallel_exec) { /* In case of parallel replication, do not update the position backwards. */ - int cmp= strcmp(group_relay_log_name, rgi->event_relay_log_name); + int cmp= compare_log_name(group_relay_log_name, rgi->event_relay_log_name); if (cmp < 0) { group_relay_log_pos= rgi->future_event_relay_log_pos; @@ -1005,7 +1005,7 @@ void Relay_log_info::inc_group_relay_log_pos(ulonglong log_pos, In the parallel case we need to update the master_log_name here, rather than in Rotate_log_event::do_update_pos(). */ - cmp= strcmp(group_master_log_name, rgi->future_event_master_log_name); + cmp= compare_log_name(group_master_log_name, rgi->future_event_master_log_name); if (cmp <= 0) { if (cmp < 0) |