diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-03-24 18:21:22 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-03-24 18:21:22 +0100 |
| commit | 335de5db1834d3aeac507f18fcd5143c22150500 (patch) | |
| tree | 95ac83922a28c81982c9ad89fcaba6c040b5111b /sql/opt_range.cc | |
| parent | b34cfe9327f2dcedb6bebfacdc2e757b6285426d (diff) | |
| parent | f72e0e686b2f3688fe98685107a293de5012be03 (diff) | |
| download | mariadb-git-335de5db1834d3aeac507f18fcd5143c22150500.tar.gz | |
Merge mariadb 5.3->mariadb 5.5
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 2e8b00982fc..c6ee117213d 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -1396,7 +1396,7 @@ SEL_IMERGE::SEL_IMERGE(SEL_IMERGE *arg, uint cnt, for (SEL_TREE **tree = trees, **arg_tree= arg->trees; tree < trees_next; tree++, arg_tree++) { - if (!(*tree= new SEL_TREE(*arg_tree, FALSE, param))) + if (!(*tree= new SEL_TREE(*arg_tree, TRUE, param))) goto mem_err; } |