database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Merge 11.6 into 11.7

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 18:15:13 +03:00
parent 8478a06cdb 43465352b9
commit f493e46494
770 changed files with 14153 additions and 10520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.h
View File

@@ -780,6 +780,7 @@ typedef struct system_variables
ulong net_wait_timeout;
ulong net_write_timeout;
ulong optimizer_extra_pruning_depth;
ulonglong optimizer_join_limit_pref_ratio;
ulong optimizer_prune_level;
ulong optimizer_search_depth;
ulong optimizer_selectivity_sampling_limit;
@@ -3867,7 +3868,7 @@ public:
ulonglong tmp_tables_size;
ulonglong bytes_sent_old;
ulonglong affected_rows; /* Number of changed rows */
ulonglong max_tmp_space_used;
ulonglong max_tmp_space_used= 0;
Opt_trace_context opt_trace;
pthread_t real_id; /* For debugging */
@@ -4675,6 +4676,7 @@ public:
is_slave_error= 0;
if (killed == KILL_BAD_DATA)
reset_killed();
my_errno= 0;
DBUG_VOID_RETURN;
}