diff options
| author | Monty <monty@mariadb.org> | 2015-06-25 23:18:48 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-06-25 23:18:48 +0300 |
| commit | 2e941fe9fce7f1667993916ff3f238a283286d3f (patch) | |
| tree | 2be9e9ab8801364e1971fa20ef96a1f6fc478403 /sql/item.cc | |
| parent | d199a0ffb0aac86881ea2db7dd78bc07b438dc67 (diff) | |
| download | mariadb-git-2e941fe9fce7f1667993916ff3f238a283286d3f.tar.gz | |
Fixed crashing bug when using ONLY_FULL_GROUP_BY in a stored procedure/trigger that is repeatedly executed.
This is MDEV-7601, including it's sub tasks MDEV-7594, MDEV-7555, MDEV-7590, MDEV-7581, MDEV-7589
The problem was that select_lex->non_agg_fields was not properly reset for re-execution and this caused an overwrite of a random memory position.
The fix was move non_agg_fields from select_lext to JOIN, which is properly reset.
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item.cc b/sql/item.cc index dbcf1b4cbe1..2f49ae46596 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4883,7 +4883,7 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference) non aggregated fields of the outer select. */ marker= select->cur_pos_in_select_list; - select->non_agg_fields.push_back(this); + select->join->non_agg_fields.push_back(this); } if (*from_field != view_ref_found) { @@ -5299,9 +5299,10 @@ bool Item_field::fix_fields(THD *thd, Item **reference) fixed= 1; if (thd->variables.sql_mode & MODE_ONLY_FULL_GROUP_BY && !outer_fixed && !thd->lex->in_sum_func && - thd->lex->current_select->cur_pos_in_select_list != UNDEF_POS) + thd->lex->current_select->cur_pos_in_select_list != UNDEF_POS && + thd->lex->current_select->join) { - thd->lex->current_select->non_agg_fields.push_back(this); + thd->lex->current_select->join->non_agg_fields.push_back(this); marker= thd->lex->current_select->cur_pos_in_select_list; } mark_non_agg_field: |