diff options
| author | unknown <kaa@polly.local> | 2006-12-08 16:02:42 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-12-08 16:02:42 +0300 |
| commit | 7c82a904f387a5dceaadf7e77b6986f631476cea (patch) | |
| tree | 4d37843c703102969401e1b157dfdd2865971756 /sql/opt_range.cc | |
| parent | 266bf3390c80e72fecdcec3712dfad18c4bf6b5b (diff) | |
| parent | 2e758a7c23fda7fada49d0cca547680cf26cafad (diff) | |
| download | mariadb-git-7c82a904f387a5dceaadf7e77b6986f631476cea.tar.gz | |
Merge polly.local:/tmp/maint/bug24261/my50-bug24261
into polly.local:/tmp/maint/bug24261/my51-bug24261
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 79b3e023a5f..001f1faf9b0 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; |