diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-07-06 23:26:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-06 23:47:38 +0200 |
| commit | 6b99859fff6b8c0a52ea45965834c9c3fdfc4cb3 (patch) | |
| tree | d28e5f54a500f279b3353107215fd33c3d32fd7e /sql | |
| parent | 89dc445a55156881318ca94ce042dbaf98e53e26 (diff) | |
| download | mariadb-git-6b99859fff6b8c0a52ea45965834c9c3fdfc4cb3.tar.gz | |
after-merge fix for a7ed4644a6f
(10.0+ changes, as specified in the MDEV)
and remove unused variable (compiler warning)
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index 7c0979e1b8d..5a6440213ed 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4991,7 +4991,6 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference) if (thd->lex->in_sum_func && thd->lex->in_sum_func->nest_level >= select->nest_level) { - Item::Type ref_type= (*reference)->type(); set_if_bigger(thd->lex->in_sum_func->max_arg_level, select->nest_level); } |