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

Merge 10.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2025-05-21 07:36:35 +03:00
parent 84dd2437c5 82d7419e06
commit 1c7209e828
71 changed files with 810 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.h
View File

@ -20,6 +20,7 @@
/* Classes in mysql */
#include <atomic>
#include <thread>
#include "dur_prop.h"
#include <waiting_threads.h>
#include "sql_const.h"
@ -736,6 +737,7 @@ typedef struct system_variables
ha_rows select_limit;
ha_rows max_join_size;
ha_rows expensive_subquery_limit;
uint analyze_max_length;
ulong auto_increment_increment, auto_increment_offset;
#ifdef WITH_WSREP
/*