diff options
| author | unknown <igor@rurik.mysql.com> | 2004-02-19 12:04:46 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2004-02-19 12:04:46 -0800 |
| commit | efaf0f0dc54315ebfa7af7afe135737a8beb743a (patch) | |
| tree | 37757b3d72181eae9a4c8e625d291057805f8bdf /sql/opt_range.cc | |
| parent | fd98ed36c6da045185a6517c6942f893524f363c (diff) | |
| download | mariadb-git-efaf0f0dc54315ebfa7af7afe135737a8beb743a.tar.gz | |
sql_select.cc, opt_range.cc, item.cc:
After merge fixes.
sql/item.cc:
After merge fixes.
sql/opt_range.cc:
After merge fixes.
sql/sql_select.cc:
After merge fixes.
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 6bcec4fef17..cdd4e0f4bf5 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -1530,21 +1530,21 @@ static SEL_TREE *get_func_mm_tree(PARAM *param, Item_func *cond_func, switch (cond_func->functype()) { case Item_func::NE_FUNC: - tree= get_mm_parts(param, field, Item_func::LT_FUNC, + tree= get_mm_parts(param, cond_func, field, Item_func::LT_FUNC, value, cmp_type); if (tree) { - tree= tree_or(param, tree, get_mm_parts(param, field, + tree= tree_or(param, tree, get_mm_parts(param, cond_func, field, Item_func::GT_FUNC, value, cmp_type)); } break; case Item_func::BETWEEN: - tree= get_mm_parts(param, field, Item_func::GE_FUNC, + tree= get_mm_parts(param, cond_func, field, Item_func::GE_FUNC, cond_func->arguments()[1],cmp_type); if (tree) { - tree= tree_and(param, tree, get_mm_parts(param, field, + tree= tree_and(param, tree, get_mm_parts(param, cond_func, field, Item_func::LE_FUNC, cond_func->arguments()[2], cmp_type)); @@ -1553,7 +1553,7 @@ static SEL_TREE *get_func_mm_tree(PARAM *param, Item_func *cond_func, case Item_func::IN_FUNC: { Item_func_in *func=(Item_func_in*) cond_func; - tree= get_mm_parts(param, field, Item_func::EQ_FUNC, + tree= get_mm_parts(param, cond_func, field, Item_func::EQ_FUNC, func->arguments()[1], cmp_type); if (tree) { @@ -1561,7 +1561,7 @@ static SEL_TREE *get_func_mm_tree(PARAM *param, Item_func *cond_func, for (arg= func->arguments()+2, end= arg+func->argument_count()-2; arg < end ; arg++) { - tree= tree_or(param, tree, get_mm_parts(param, field, + tree= tree_or(param, tree, get_mm_parts(param, cond_func, field, Item_func::EQ_FUNC, *arg, cmp_type)); @@ -1581,7 +1581,7 @@ static SEL_TREE *get_func_mm_tree(PARAM *param, Item_func *cond_func, Item_func::Functype func_type= (value != cond_func->arguments()[0]) ? cond_func->functype() : ((Item_bool_func2*) cond_func)->rev_functype(); - tree= get_mm_parts(param, field, func_type, value, cmp_type); + tree= get_mm_parts(param, cond_func, field, func_type, value, cmp_type); } } @@ -1690,7 +1690,7 @@ static SEL_TREE *get_mm_tree(PARAM *param,COND *cond) Item_result cmp_type= field->cmp_type(); if (!((ref_tables | field->table->map) & param_comp)) { - tree= get_mm_parts(param, field, Item_func::EQ_FUNC, + tree= get_mm_parts(param, cond, field, Item_func::EQ_FUNC, value,cmp_type); ftree= !ftree ? tree : tree_and(param, ftree, tree); } |