diff options
| author | unknown <igor@rurik.mysql.com> | 2003-10-01 23:37:05 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-10-01 23:37:05 -0700 |
| commit | 06ecf87e15d8e8d7ae24aa23ccead4a2c4bbc78e (patch) | |
| tree | b01319a4b1ce6d72b1867800eec320e03d3a9acd /sql/opt_range.cc | |
| parent | 09e7be1d821831eee3bdeb0126a92aa7c23bed7d (diff) | |
| download | mariadb-git-06ecf87e15d8e8d7ae24aa23ccead4a2c4bbc78e.tar.gz | |
Many files:
Fix after manual merge
mysql-test/r/range.result:
Fix after manual merge
sql/handler.cc:
Fix after manual merge
sql/mysql_priv.h:
Fix after manual merge
sql/opt_range.cc:
Fix after manual merge
sql/set_var.cc:
Fix after manual merge
sql/sql_base.cc:
Fix after manual merge
sql/sql_parse.cc:
Fix after manual merge
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 7376c2e24bb..d9a8c822c5f 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -895,6 +895,12 @@ get_mm_parts(PARAM *param, Field *field, Item_func::Functype type, if (field->table != param->table) DBUG_RETURN(0); + if (type == Item_func::NE_FUNC) + { + ne_func= TRUE; + type= Item_func::LT_FUNC; + } + KEY_PART *key_part = param->key_parts; KEY_PART *end = param->key_parts_end; SEL_TREE *tree=0; @@ -934,7 +940,7 @@ get_mm_parts(PARAM *param, Field *field, Item_func::Functype type, SEL_TREE *tree2= get_mm_parts(param, field, Item_func::GT_FUNC, value, cmp_type); if (tree2) - tree= tree=tree_or(param,tree,tree2); + tree= tree_or(param,tree,tree2); } DBUG_RETURN(tree); } |