diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-16 06:27:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-16 06:27:55 +0300 |
| commit | 4f29d776c756ac522ae49c481ea8975dee8787fe (patch) | |
| tree | d152b05f3bca9b4022802654c129f0470ed92038 /sql/sql_repl.cc | |
| parent | a4996f951d731322acc63033646d950ddbb0f60c (diff) | |
| parent | 3eadb135fd7b7e2d40fd6b9a819ac3245043f781 (diff) | |
| download | mariadb-git-4f29d776c756ac522ae49c481ea8975dee8787fe.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 4b8053d0b77..74ddd981a4b 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2018, Oracle and/or its affiliates. - Copyright (c) 2008, 2019, MariaDB Corporation + Copyright (c) 2008, 2020, MariaDB Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -2005,7 +2005,7 @@ send_event_to_slave(binlog_send_info *info, Log_event_type event_type, pos= my_b_tell(log); if (repl_semisync_master.update_sync_header(info->thd, - (uchar*) packet->ptr(), + (uchar*) packet->c_ptr_safe(), info->log_file_name + info->dirlen, pos, &need_sync)) { @@ -2029,7 +2029,8 @@ send_event_to_slave(binlog_send_info *info, Log_event_type event_type, } } - if (need_sync && repl_semisync_master.flush_net(info->thd, packet->c_ptr())) + if (need_sync && repl_semisync_master.flush_net(info->thd, + packet->c_ptr_safe())) { info->error= ER_UNKNOWN_ERROR; return "Failed to run hook 'after_send_event'"; |