database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch bb-10.2-release into bb-10.3-release

Browse Source
This commit is contained in:
Nikita Malyavin
2021-05-04 14:49:31 +03:00
parent 2820f30dde 72fa9dabad
commit a8a925dd22
88 changed files with 1696 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/log_event.cc
View File

@@ -15097,14 +15097,23 @@ bool copy_event_cache_to_file_and_reinit(IO_CACHE *cache, FILE *file)
}
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
Heartbeat_log_event::Heartbeat_log_event(const char* buf, uint event_len,
Heartbeat_log_event::Heartbeat_log_event(const char* buf, ulong event_len,
const Format_description_log_event* description_event)
:Log_event(buf, description_event)
{
uint8 header_size= description_event->common_header_len;
ident_len = event_len - header_size;
set_if_smaller(ident_len,FN_REFLEN-1);
log_ident= buf + header_size;
if (log_pos == 0)
{
log_pos= uint8korr(buf + header_size);
log_ident= buf + header_size + HB_SUB_HEADER_LEN;
ident_len= event_len - (header_size + HB_SUB_HEADER_LEN);
}
else
{
log_ident= buf + header_size;
ident_len = event_len - header_size;
}
}
#endif