diff options
| author | unknown <sergefp@mysql.com> | 2007-03-31 00:48:31 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2007-03-31 00:48:31 +0400 |
| commit | 2016b21ce1517e0c3969231bd50de5181355edcc (patch) | |
| tree | 3fbbf88845dd6328699a52873a0d958abd705548 /sql/opt_range.cc | |
| parent | 86a0ffdd3c068edc63e3bda21d88980699c451dd (diff) | |
| parent | 080c0c7ac8df45e6d6eb544e611183d029f4fb63 (diff) | |
| download | mariadb-git-2016b21ce1517e0c3969231bd50de5181355edcc.tar.gz | |
BUG#26624, pushbuild fixes: Merge to 5.0
mysql-test/r/range.result:
Auto merged
mysql-test/t/range.test:
Auto merged
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 153aa78fbd0..c3aa1f52556 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -257,7 +257,7 @@ public: enum leaf_color { BLACK,RED } color; enum Type { IMPOSSIBLE, MAYBE, MAYBE_KEY, KEY_RANGE } type; - enum { MAX_SEL_ARGS = 64000 }; + enum { MAX_SEL_ARGS = 16000 }; SEL_ARG() {} SEL_ARG(SEL_ARG &); @@ -4621,8 +4621,8 @@ tree_and(PARAM *param,SEL_TREE *tree1,SEL_TREE *tree2) } result_keys.set_bit(key1 - tree1->keys); #ifdef EXTRA_DEBUG - if (*key1) - (*key1)->test_use_count(*key1); + if (*key1 && param->alloced_sel_args < SEL_ARG::MAX_SEL_ARGS) + (*key1)->test_use_count(*key1); #endif } } @@ -4703,7 +4703,8 @@ tree_or(PARAM *param,SEL_TREE *tree1,SEL_TREE *tree2) result=tree1; // Added to tree1 result_keys.set_bit(key1 - tree1->keys); #ifdef EXTRA_DEBUG - (*key1)->test_use_count(*key1); + if (param->alloced_sel_args < SEL_ARG::MAX_SEL_ARGS) + (*key1)->test_use_count(*key1); #endif } } |