diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2012-08-09 15:50:29 +0400 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2012-08-09 15:50:29 +0400 |
| commit | ec766b5dabdd98f3e7ed03435706ca5962834063 (patch) | |
| tree | 0dc77d97fc835d2a6e62c405b6a4b0ad58a2a827 /sql/sql_select.cc | |
| parent | d61a7909b932c8d1e8343239aa2774baa4a63269 (diff) | |
| parent | af3fdefca52ace7f94c0b7217dbb4ea678829a3b (diff) | |
| download | mariadb-git-ec766b5dabdd98f3e7ed03435706ca5962834063.tar.gz | |
5.1 -> 5.5 merge
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 8f4439c4dc1..7169a834ff7 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -557,8 +557,6 @@ JOIN::prepare(Item ***rref_pointer_array, if (having) { - Query_arena backup, *arena; - arena= thd->activate_stmt_arena_if_needed(&backup); nesting_map save_allow_sum_func= thd->lex->allow_sum_func; thd->where="having clause"; thd->lex->allow_sum_func|= 1 << select_lex_arg->nest_level; @@ -568,8 +566,6 @@ JOIN::prepare(Item ***rref_pointer_array, having->check_cols(1))); select_lex->having_fix_field= 0; select_lex->having= having; - if (arena) - thd->restore_active_arena(arena, &backup); if (having_fix_rc || thd->is_error()) DBUG_RETURN(-1); /* purecov: inspected */ |