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/sql_select.h | |
| 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/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index de5baeee151..4f807ff5b93 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -922,6 +922,9 @@ public: Item *pre_sort_idx_pushed_cond; void clean_pre_sort_join_tab(); + /* List of fields that aren't under an aggregate function */ + List<Item_field> non_agg_fields; + /* For "Using temporary+Using filesort" queries, JOIN::join_tab can point to either: @@ -1301,6 +1304,7 @@ public: all_fields= fields_arg; if (&fields_list != &fields_arg) /* Avoid valgrind-warning */ fields_list= fields_arg; + non_agg_fields.empty(); bzero((char*) &keyuse,sizeof(keyuse)); tmp_table_param.init(); tmp_table_param.end_write_records= HA_POS_ERROR; |