diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2004-08-26 16:51:26 +0500 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2004-08-26 16:51:26 +0500 |
| commit | 45f49c60cd124315e2d70905f3a01d6f738123f6 (patch) | |
| tree | 1ca065ee635d6154b908894cf44330dbd59194e6 /sql/opt_range.cc | |
| parent | b6425bc22c73e1869e3e7b71fb1bf2d90a229927 (diff) | |
| download | mariadb-git-45f49c60cd124315e2d70905f3a01d6f738123f6.tar.gz | |
A fix (Bug#5219: Cannot use '||' with MBRContains(..)).
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 40e3ffebe56..02947e58a9e 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -1302,14 +1302,14 @@ tree_and(PARAM *param,SEL_TREE *tree1,SEL_TREE *tree2) if (*key2 && !(*key2)->simple_key()) flag|=CLONE_KEY2_MAYBE; *key1=key_and(*key1,*key2,flag); - if ((*key1)->type == SEL_ARG::IMPOSSIBLE) + if (*key1 && (*key1)->type == SEL_ARG::IMPOSSIBLE) { tree1->type= SEL_TREE::IMPOSSIBLE; - break; - } #ifdef EXTRA_DEBUG - (*key1)->test_use_count(*key1); + (*key1)->test_use_count(*key1); #endif + break; + } } } DBUG_RETURN(tree1); @@ -1401,6 +1401,12 @@ key_and(SEL_ARG *key1,SEL_ARG *key2,uint clone_flag) return key2; if (!key2) return key1; + if ((key1->min_flag | key2->min_flag) & GEOM_FLAG) + { + key1->free_tree(); + key2->free_tree(); + return 0; // Can't optimize this + } if (key1->part != key2->part) { if (key1->part > key2->part) @@ -1538,7 +1544,8 @@ key_or(SEL_ARG *key1,SEL_ARG *key2) key1->use_count--; key2->use_count--; - if (key1->part != key2->part) + if (key1->part != key2->part || + (key1->min_flag | key2->min_flag) & GEOM_FLAG) { key1->free_tree(); key2->free_tree(); |