diff options
| author | Andrei Elkin <andrei.elkin@mariadb.com> | 2019-11-11 16:28:21 +0200 |
|---|---|---|
| committer | Andrei Elkin <andrei.elkin@mariadb.com> | 2019-11-11 16:28:21 +0200 |
| commit | d103c5a489d1d96c967c90f25fefc4aa0083ed07 (patch) | |
| tree | 9e51cb2d10e036b062b74d08d2f90c45fb234558 /sql/sql_repl.cc | |
| parent | 4fcfdb60e788c6c8cebe35e2e0f8d9595cc9e930 (diff) | |
| parent | 26fd880d5eba5e46e69f88f21cc6ca45cbda0a4f (diff) | |
| download | mariadb-git-d103c5a489d1d96c967c90f25fefc4aa0083ed07.tar.gz | |
merge 10.2->10.3 with conflict resolutions
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 2f547707ed5..bb25ca69924 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -2777,7 +2777,10 @@ void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos, /* Check if the dump thread is created by a slave with semisync enabled. */ thd->semi_sync_slave = is_semi_sync_slave(); - if (repl_semisync_master.dump_start(thd, log_ident, pos)) + + DBUG_ASSERT(pos == linfo.pos); + + if (repl_semisync_master.dump_start(thd, linfo.log_file_name, linfo.pos)) { info->errmsg= "Failed to run hook 'transmit_start'"; info->error= ER_UNKNOWN_ERROR; |