diff options
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 0b1503a5b03..6942e4291b2 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -40,6 +40,7 @@ #include <functional> #include <memory> #include <map> +#include <lex_charset.h> #ifdef MYSQL_CLIENT #include "sql_const.h" @@ -229,7 +230,8 @@ class String; packet (i.e. a query) sent from client to master; First, an auxiliary log_event status vars estimation: */ -#define MAX_SIZE_LOG_EVENT_STATUS (1 + 4 /* type, flags2 */ + \ +#define MAX_SIZE_LOG_EVENT_STATUS (uint) \ + (1 + 4 /* type, flags2 */ + \ 1 + 8 /* type, sql_mode */ + \ 1 + 1 + 255 /* type, length, catalog */ + \ 1 + 4 /* type, auto_increment */ + \ @@ -241,7 +243,10 @@ class String; 1 + 4 /* type, master_data_written */ + \ 1 + 3 /* type, sec_part of NOW() */ + \ 1 + 16 + 1 + 60/* type, user_len, user, host_len, host */ + \ - 1 + 2 + 8 /* type, flags3, seq_no */) + 1 + 2 + 8 /* type, flags3, seq_no */ + \ + 1 + Charset_collation_map_st::binary_size_max() \ + /* type, map */ \ + ) #define MAX_LOG_EVENT_HEADER ( /* in order of Query_log_event::write */ \ LOG_EVENT_HEADER_LEN + /* write_header */ \ QUERY_HEADER_LEN + /* write_data */ \ @@ -323,6 +328,8 @@ class String; #define Q_XID 129 #define Q_GTID_FLAGS3 130 + +#define Q_CHARACTER_SET_COLLATIONS 131 /* Intvar event post-header */ /* Intvar event data */ @@ -2147,6 +2154,8 @@ public: bool sql_mode_inited; bool charset_inited; + LEX_CSTRING character_set_collations; + uint32 flags2; sql_mode_t sql_mode; ulong auto_increment_increment, auto_increment_offset; |