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.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-05-12 22:14:59 +03:00
parent 5e84ea9634 77867c147b
commit 15419a5583
174 changed files with 5908 additions and 1798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_select.h
View File

@ -1571,6 +1571,15 @@ public:
/* Number of tables actually joined at the top level */
uint exec_join_tab_cnt() { return tables_list ? top_join_tab_count : 0; }
/*
Number of tables in the join which also includes the temporary tables
created for GROUP BY, DISTINCT , WINDOW FUNCTION etc.
*/
uint total_join_tab_cnt()
{
return exec_join_tab_cnt() + aggr_tables - 1;
}
int prepare(TABLE_LIST *tables, uint wind_num,
COND *conds, uint og_num, ORDER *order, bool skip_order_by,
ORDER *group, Item *having, ORDER *proc_param, SELECT_LEX *select,