mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 07:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.6 into 10.11

Browse source
This commit is contained in:
Marko Mäkelä 2024-06-27 10:26:09 +03:00
commit 27a3366663
372 changed files with 7663 additions and 6515 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sql/log_event_server.cc
View file

@ -9016,6 +9016,7 @@ uint8 Update_rows_log_event::get_trg_event_map()
#endif
#if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
void Incident_log_event::pack_info(Protocol *protocol)
{
char buf[256];
@ -9028,7 +9029,7 @@ void Incident_log_event::pack_info(Protocol *protocol)
m_incident, description(), m_message.str);
protocol->store(buf, bytes, &my_charset_bin);
}
#endif
#if defined(WITH_WSREP)
/*
@ -9114,6 +9115,7 @@ Incident_log_event::write_data_body()
}
#if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
/* Pack info for its unrecognized ignorable event */
void Ignorable_log_event::pack_info(Protocol *protocol)
{
@ -9123,7 +9125,7 @@ void Ignorable_log_event::pack_info(Protocol *protocol)
number, description);
protocol->store(buf, bytes, &my_charset_bin);
}
#endif
#if defined(HAVE_REPLICATION)
Heartbeat_log_event::Heartbeat_log_event(const uchar *buf, uint event_len,