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.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/item.h')
-rw-r--r-- | sql/item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 4aaa67d9a1d..a38a25dfc75 100644 --- a/sql/item.h +++ b/sql/item.h @@ -631,7 +631,7 @@ public: */ uint name_length; /* Length of name */ uint decimals; - int8 marker; + int marker; bool maybe_null; /* If item may be null */ bool in_rollup; /* If used in GROUP BY list of a query with ROLLUP */ |