diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-06-09 14:23:45 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-05 17:15:57 +0200 |
| commit | c917ba1d5108ab90f861d4cd099feb515e54844d (patch) | |
| tree | f3ca825d3c6248696852549d8a4aac21413049fb /sql/item.cc | |
| parent | 5c30fcfa2fd52df16a7f3202fda9a377a4744c18 (diff) | |
| download | mariadb-git-c917ba1d5108ab90f861d4cd099feb515e54844d.tar.gz | |
fix the comparison in st_select_lex::setup_ref_array()
the array only needs to be reallocated if it's smaller
than needed. Being larger is ok.
also: remove a duplicated check (merge error)
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index 30778132afc..df1f66fde28 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -494,8 +494,7 @@ Item::Item(THD *thd): { enum_parsing_place place= thd->lex->current_select->parsing_place; - if (place == SELECT_LIST || - place == IN_HAVING) + if (place == SELECT_LIST || place == IN_HAVING) thd->lex->current_select->select_n_having_items++; } } |