diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2020-05-15 17:13:35 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2020-05-15 17:13:35 +0300 |
| commit | f2a944516ea8fd3de1d79d46da5aa1c8a32cd78d (patch) | |
| tree | a58d318446f4ac7fc199e53efa7e0029023cc3c6 /sql/opt_range.cc | |
| parent | 3b251e24b6c8fe81bc5eeca086d9c1e57e6739d2 (diff) | |
| parent | a4996f951d731322acc63033646d950ddbb0f60c (diff) | |
| download | mariadb-git-f2a944516ea8fd3de1d79d46da5aa1c8a32cd78d.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index be907a0c4b3..ab0040c9f7e 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2730,6 +2730,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use, param.imerge_cost_buff_size= 0; param.using_real_indexes= TRUE; param.remove_jump_scans= TRUE; + param.max_key_parts= 0; param.remove_false_where_parts= remove_false_parts_of_where; param.force_default_mrr= ordered_output; param.possible_keys.clear_all(); @@ -3451,6 +3452,7 @@ bool calculate_cond_selectivity_for_table(THD *thd, TABLE *table, Item **cond) param.using_real_indexes= FALSE; param.real_keynr[0]= 0; param.alloced_sel_args= 0; + param.max_key_parts= 0; thd->no_errors=1; |