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 branch '11.0' into 11.1

Browse Source
This commit is contained in:
Sergei Golubchik
2024-02-02 09:46:57 +01:00
parent 3b32110ac4 6ef0b2ee5f
commit b6680e0101
370 changed files with 8526 additions and 2463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sql/sql_class.h
View File

@@ -281,9 +281,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;
/*
@@ -657,6 +656,15 @@ enum killed_type
KILL_TYPE_QUERY
};
#define SECONDS_TO_WAIT_FOR_KILL 2
#define SECONDS_TO_WAIT_FOR_DUMP_THREAD_KILL 10
#if !defined(_WIN32) && defined(HAVE_SELECT)
/* my_sleep() can wait for sub second times */
#define WAIT_FOR_KILL_TRY_TIMES 20
#else
#define WAIT_FOR_KILL_TRY_TIMES 2
#endif
#include "sql_lex.h" /* Must be here */
class Delayed_insert;
@@ -761,9 +769,10 @@ typedef struct system_variables
ulong optimizer_search_depth;
ulong optimizer_selectivity_sampling_limit;
ulong optimizer_use_condition_selectivity;
ulong optimizer_trace_max_mem_size;
ulong optimizer_max_sel_arg_weight;
ulong optimizer_max_sel_args;
ulong optimizer_trace_max_mem_size;
ulong optimizer_adjust_secondary_key_costs;
ulong use_stat_tables;
ulong histogram_size;
ulong histogram_type;
@@ -7148,7 +7157,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:
@@ -7157,8 +7166,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;