diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-04-26 21:11:06 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-04-26 21:11:06 -0700 |
| commit | 24edac2211c46ea9ebeb4a13bc467fb20008916e (patch) | |
| tree | e882cd519a70e326be9086468c7a6113102bf7f8 /sql/opt_range.cc | |
| parent | 79439d9a7447aac68bba7d68c2d3bf76cc319fdb (diff) | |
| parent | 8d9dd21d85e257051b45b2f779dcd9bf696bf9e1 (diff) | |
| download | mariadb-git-24edac2211c46ea9ebeb4a13bc467fb20008916e.tar.gz | |
Merge
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 0eb1bd3ce36..8d0d1c03ee5 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -7104,11 +7104,10 @@ static SEL_TREE *get_full_func_mm_tree(RANGE_OPT_PARAM *param, Item_equal *item_equal= field_item->item_equal; if (item_equal) { - Item_equal_iterator it(*item_equal); - Item_field *item; - while ((item= it++)) + Item_equal_fields_iterator it(*item_equal); + while (it++) { - Field *f= item->field; + Field *f= it.get_curr_field(); if (field->eq(f)) continue; if (!((ref_tables | f->table->map) & param_comp)) @@ -7259,11 +7258,11 @@ static SEL_TREE *get_mm_tree(RANGE_OPT_PARAM *param,COND *cond) Item_equal *item_equal= (Item_equal *) cond; if (!(value= item_equal->get_const())) DBUG_RETURN(0); - Item_equal_iterator it(*item_equal); + Item_equal_fields_iterator it(*item_equal); ref_tables= value->used_tables(); - while ((field_item= it++)) + while (it++) { - Field *field= field_item->field; + Field *field= it.get_curr_field(); Item_result cmp_type= field->cmp_type(); if (!((ref_tables | field->table->map) & param_comp)) { |