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 11.0 into 11.1

Browse Source
This commit is contained in:
Marko Mäkelä
2023-06-08 14:09:21 +03:00
parent d85a135647 5fb2c031f7
commit 3883eb63dc
165 changed files with 4391 additions and 1929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_select.h
View File

@ -227,7 +227,7 @@ enum sj_strategy_enum
typedef enum_nested_loop_state
(*Next_select_func)(JOIN *, struct st_join_table *, bool);
Next_select_func setup_end_select_func(JOIN *join, JOIN_TAB *tab);
Next_select_func setup_end_select_func(JOIN *join);
int rr_sequential(READ_RECORD *info);
int read_record_func_for_rr_and_unpack(READ_RECORD *info);
Item *remove_pushed_top_conjuncts(THD *thd, Item *cond);
@ -368,8 +368,10 @@ typedef struct st_join_table {
/* set by estimate_scan_time() */
double cached_scan_and_compare_time;
double cached_forced_index_cost;
ALL_READ_COST cached_scan_and_compare_cost;
/* Used with force_index_join */
ALL_READ_COST cached_forced_index_cost;
/*
dependent is the table that must be read before the current one
Used for example with STRAIGHT_JOIN or outer joins
@ -1810,7 +1812,8 @@ public:
void join_free();
/** Cleanup this JOIN, possibly for reuse */
void cleanup(bool full);
void clear();
void clear(table_map *cleared_tables);
void inline clear_sum_funcs();
bool send_row_on_empty_set()
{
return (do_send_rows && implicit_grouping && !group_optimized_away &&