diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-12 17:21:37 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-12 17:21:37 +0200 |
| commit | 1fe6e5a1a5ab1b8f6d64bf33c57f75ede55714b2 (patch) | |
| tree | cacbab7a1228dbba771b28784ec88515f9ac0fa5 /sql/sql_repl.cc | |
| parent | e26d049197daef399a457d36e545d7ab5700c29a (diff) | |
| parent | 33cb10d4e9793d1b6800be22e8eb9ceffdd8af4a (diff) | |
| download | mariadb-git-1fe6e5a1a5ab1b8f6d64bf33c57f75ede55714b2.tar.gz | |
Merge 10.4 into 10.5
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 791bfc2c9fc..39322b18a4f 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; |