database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

manual merge 10.1->10.2

Browse Source
This commit is contained in:
Andrei Elkin
2019-11-11 16:03:43 +02:00
parent 142442d571 13db50fc03
commit 26fd880d5e
10 changed files with 281 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_repl.cc
View File

@ -2742,7 +2742,11 @@ void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos,
run hook first when all check has been made that slave seems to
be requesting a reasonable position. i.e when transmit actually starts
*/
if (RUN_HOOK(binlog_transmit, transmit_start, (thd, flags, log_ident, pos)))
DBUG_ASSERT(pos == linfo.pos);
if (RUN_HOOK(binlog_transmit, transmit_start,
(thd, flags, linfo.log_file_name, linfo.pos)))
{
info->errmsg= "Failed to run hook 'transmit_start'";
info->error= ER_UNKNOWN_ERROR;