diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-28 12:22:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-28 12:22:56 +0300 |
| commit | 7830fb7f45b3824c0375c00ae2cab357165904cf (patch) | |
| tree | 730521737fdc48e69f7650819e9a29da6487e1f4 /sql/opt_range.h | |
| parent | b805ebd7ed49868f83e6fd3fe72a11ddacdce452 (diff) | |
| parent | 55163ba1bdb1a05daadc66c41c959994231b361c (diff) | |
| download | mariadb-git-7830fb7f45b3824c0375c00ae2cab357165904cf.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/opt_range.h')
| -rw-r--r-- | sql/opt_range.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/opt_range.h b/sql/opt_range.h index bd85a12d4a1..d5416988b88 100644 --- a/sql/opt_range.h +++ b/sql/opt_range.h @@ -242,7 +242,7 @@ public: Number of children of this element in the RB-tree, plus 1 for this element itself. */ - uint16 elements; + uint32 elements; /* Valid only for elements which are RB-tree roots: Number of times this RB-tree is referred to (it is referred by SEL_ARG::next_key_part or by @@ -1724,6 +1724,9 @@ SQL_SELECT *make_select(TABLE *head, table_map const_tables, bool calculate_cond_selectivity_for_table(THD *thd, TABLE *table, Item **cond); +bool eq_ranges_exceeds_limit(RANGE_SEQ_IF *seq, void *seq_init_param, + uint limit); + #ifdef WITH_PARTITION_STORAGE_ENGINE bool prune_partitions(THD *thd, TABLE *table, Item *pprune_cond); #endif |