1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Mattias Jonsson 2012-08-13 11:21:28 +02:00
commit 0614a8d969
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sql/opt_range.cc
View File

@ -3071,11 +3071,6 @@ int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ARG *key_tree)
ppar->cur_subpart_fields+= ppar->is_subpart_keypart[key_tree_part]; ppar->cur_subpart_fields+= ppar->is_subpart_keypart[key_tree_part];
*(ppar->arg_stack_end++)= key_tree; *(ppar->arg_stack_end++)= key_tree;
if (key_tree->type == SEL_ARG::KEY_RANGE)
{
if (ppar->part_info->get_part_iter_for_interval &&
key_tree->part <= ppar->last_part_partno)
{
if (ignore_part_fields) if (ignore_part_fields)
{ {
/* /*
@ -3092,6 +3087,12 @@ int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ARG *key_tree)
res= -1; res= -1;
goto pop_and_go_right; goto pop_and_go_right;
} }
if (key_tree->type == SEL_ARG::KEY_RANGE)
{
if (ppar->part_info->get_part_iter_for_interval &&
key_tree->part <= ppar->last_part_partno)
{
/* Collect left and right bound, their lengths and flags */ /* Collect left and right bound, their lengths and flags */
uchar *min_key= ppar->cur_min_key; uchar *min_key= ppar->cur_min_key;
uchar *max_key= ppar->cur_max_key; uchar *max_key= ppar->cur_max_key;
@ -3332,6 +3333,13 @@ int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ARG *key_tree)
res= -1; res= -1;
goto pop_and_go_right; goto pop_and_go_right;
} }
/*
No meaning in continuing with rest of partitioning key parts.
Will try to continue with subpartitioning key parts.
*/
ppar->ignore_part_fields= true;
did_set_ignore_part_fields= true;
goto process_next_key_part;
} }
} }