diff options
| author | unknown <kaa@polly.local> | 2006-12-08 23:47:49 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-12-08 23:47:49 +0300 |
| commit | 50b1b0dadb75ff9816dc8d680b207452bb1d0c2a (patch) | |
| tree | f12281323d7184366353a80d6042074ab78cfb88 /sql/opt_range.cc | |
| parent | 700a6e59e1d440fdff62fae95668edd73ab29359 (diff) | |
| parent | 7c82a904f387a5dceaadf7e77b6986f631476cea (diff) | |
| download | mariadb-git-50b1b0dadb75ff9816dc8d680b207452bb1d0c2a.tar.gz | |
Merge polly.local:/tmp/maint/bug24261/my51-bug24261
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
mysql-test/r/func_in.result:
Auto merged
mysql-test/t/func_in.test:
Auto merged
sql/opt_range.cc:
Auto merged
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index fa575e73c39..d881ab769b0 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -5012,7 +5012,8 @@ static SEL_TREE *get_func_mm_tree(RANGE_OPT_PARAM *param, Item_func *cond_func, for (uint idx= 0; idx < param->keys; idx++) { SEL_ARG *new_interval, *last_val; - if (((new_interval= tree2->keys[idx])) && + if (((new_interval= tree2->keys[idx])) && + (tree->keys[idx]) && ((last_val= tree->keys[idx]->last()))) { new_interval->min_value= last_val->max_value; |