diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-08-26 16:35:38 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-08-26 16:35:38 +0400 |
| commit | d39dbd1084467494fec0799afc598a9f1bb52fa0 (patch) | |
| tree | f8f8abb235d98bb13f4b8b1d0036fe1765c3fb47 /sql/opt_range.cc | |
| parent | 2c379a1e26bcc3ca363be781e45f37b640ed6f41 (diff) | |
| parent | 756076bd23d9e194d5730745d07ee86aa543d4e5 (diff) | |
| download | mariadb-git-d39dbd1084467494fec0799afc598a9f1bb52fa0.tar.gz | |
Automerge.
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index af5b4b7c7d6..b9819def54d 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -5620,7 +5620,11 @@ static SEL_TREE *get_mm_tree(RANGE_OPT_PARAM *param,COND *cond) SEL_TREE *tmp= get_full_func_mm_tree(param, cond_func, field_item, (Item*)(intptr)i, inv); if (inv) + { tree= !tree ? tmp : tree_or(param, tree, tmp); + if (tree == NULL) + break; + } else tree= tree_and(param, tree, tmp); } |