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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-01-17 13:35:05 +02:00
parent 6a514ef672 fa3171df08
commit 3a96eba25f
51 changed files with 976 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sql/log_event.h
View File

@@ -57,6 +57,8 @@
#include "rpl_gtid.h"
#include "log_event_data_type.h"
/* Forward declarations */
#ifndef MYSQL_CLIENT
class String;
@@ -3284,33 +3286,27 @@ private:
@section User_var_log_event_binary_format Binary Format
*/
class User_var_log_event: public Log_event
class User_var_log_event: public Log_event, public Log_event_data_type
{
public:
enum {
UNDEF_F= 0,
UNSIGNED_F= 1
};
const char *name;
size_t name_len;
const char *val;
size_t val_len;
Item_result type;
uint charset_number;
bool is_null;
uchar flags;
#ifdef MYSQL_SERVER
bool deferred;
query_id_t query_id;
User_var_log_event(THD* thd_arg, const char *name_arg, size_t name_len_arg,
const char *val_arg, size_t val_len_arg,
Item_result type_arg,
uint charset_number_arg, uchar flags_arg,
const Log_event_data_type &data_type,
bool using_trans, bool direct)
:Log_event(thd_arg, 0, using_trans),
Log_event_data_type(data_type),
name(name_arg), name_len(name_len_arg), val(val_arg),
val_len(val_len_arg), type(type_arg), charset_number(charset_number_arg),
flags(flags_arg), deferred(false)
val_len(val_len_arg),
deferred(false)
{
is_null= !val;
if (direct)