summaryrefslogtreecommitdiff
path: root/sql/sql_select.h
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2014-02-15 01:21:46 +0400
committerSergey Petrunya <psergey@askmonty.org>2014-02-15 01:21:46 +0400
commit8c9b2f3429fd385ded604ec048f1fcbd89c3a846 (patch)
treec114042bfa4eacc2c7afb3b54aba319fe11715f7 /sql/sql_select.h
parent9d5731ef1b5a3f879d4234cddc694b629d823106 (diff)
downloadmariadb-git-8c9b2f3429fd385ded604ec048f1fcbd89c3a846.tar.gz
MDEV-5581: Server crashes in in JOIN::prepare on 2nd execution of PS with materialization+semijoin
- The problem was that JOIN::prepare() tried to set TABLE::maybe_null for a table in join. Non-merged semi-join tables 1) are present as join's base tables on second EXECUTE, but 2) do not yet have a TABLE object. Worked around the problem by putting mixed_implicit_grouping into JOIN object, and then passing it to JTBM tables in setup_jtbm_semi_joins().
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r--sql/sql_select.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h
index be595972671..569c0394d6e 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -1110,7 +1110,8 @@ public:
*/
JOIN *tmp_join;
ROLLUP rollup; ///< Used with rollup
-
+
+ bool mixed_implicit_grouping;
bool select_distinct; ///< Set if SELECT DISTINCT
/**
If we have the GROUP BY statement in the query,