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 remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Alexander Barkov
2017-05-05 16:12:54 +04:00
parent 583b68e899 db0917f68f
commit ac53b49b1b
398 changed files with 15220 additions and 4380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_select.h
View File

@ -1492,6 +1492,8 @@ public:
/* True if the plan guarantees that it will be returned zero or one row */
bool only_const_tables() { return const_tables == table_count; }
/* Number of tables actually joined at the top level */
uint exec_join_tab_cnt() { return tables_list ? top_join_tab_count : 0; }
int prepare(TABLE_LIST *tables, uint wind_num,
COND *conds, uint og_num, ORDER *order, bool skip_order_by,