summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorigor@rurik.mysql.com <>2004-10-20 13:16:00 -0700
committerigor@rurik.mysql.com <>2004-10-20 13:16:00 -0700
commitf64d88a9f31ad319b25f710acdfb405325ba3fc6 (patch)
tree291f3a77f3e7458f43eb18749cfbd1cc36ed2ff6 /sql
parenta03e5ad8e4982e034c960f0a8d558c3b3f2c134a (diff)
downloadmariadb-git-f64d88a9f31ad319b25f710acdfb405325ba3fc6.tar.gz
opt_range.cc:
Post automerge correction.
Diffstat (limited to 'sql')
-rw-r--r--sql/opt_range.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 1757ef7f864..fdb32b2a09c 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -3388,6 +3388,8 @@ static SEL_TREE *get_mm_tree(PARAM *param,COND *cond)
if (cond_func->select_optimize() == Item_func::OPTIMIZE_NONE)
DBUG_RETURN(0); // Can't be calculated
+ param->cond= cond;
+
switch (cond_func->functype()) {
case Item_func::BETWEEN:
if (cond_func->arguments()[0]->type() != Item::FIELD_ITEM)