database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +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

7
sql/sql_class.h
View File

@ -278,9 +278,8 @@ typedef struct st_user_var_events
user_var_entry *user_var_event;
char *value;
size_t length;
Item_result type;
const Type_handler *th;
uint charset_number;
bool unsigned_flag;
} BINLOG_USER_VAR_EVENT;
/*
@ -7133,7 +7132,7 @@ public:
// this is needed for user_vars hash
class user_var_entry
class user_var_entry: public Type_handler_hybrid_field_type
{
CHARSET_INFO *m_charset;
public:
@ -7142,8 +7141,6 @@ class user_var_entry
char *value;
size_t length;
query_id_t update_query_id, used_query_id;
Item_result type;
bool unsigned_flag;
double val_real(bool *null_value);
longlong val_int(bool *null_value) const;