diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-12 16:55:44 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-12 16:55:44 +0200 |
| commit | 33cb10d4e9793d1b6800be22e8eb9ceffdd8af4a (patch) | |
| tree | 19de2029cc51b44d05e2253681ec6e8cf8d229c6 /sql/sql_repl.cc | |
| parent | e5f99a0c0ccbb6cbf4a816fed552af9c20cc32e9 (diff) | |
| parent | 5098d708a07f90484c9e13fe3ab58113a8a10191 (diff) | |
| download | mariadb-git-33cb10d4e9793d1b6800be22e8eb9ceffdd8af4a.tar.gz | |
Merge 10.3 into 10.4
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 a0f952955d5..9f7413241b6 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -2824,7 +2824,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; |