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 branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-08-04 16:58:42 +02:00
parent 558f1eff64 3b071bad19
commit ee620a7416
28 changed files with 645 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_select.h
View File

@ -1317,6 +1317,7 @@ public:
#ifndef DBUG_OFF
void dbug_verify_sj_inner_tables(uint n_positions) const;
int dbug_join_tab_array_size;
#endif
/* We also maintain a stack of join optimization states in * join->positions[] */