summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2019-04-02 15:04:45 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2019-04-02 15:04:45 +0200
commit11fa88ef67bea74bd13ad688938a03d5b266db64 (patch)
tree7be3a6574ff43cfa6fe4d6e0ce2ded45a6fa2985 /sql/sql_select.cc
parenta90622644c11568c2bf982492d2f47bc164ddfef (diff)
downloadmariadb-git-bb-10.4-MDEV-17362.tar.gz
MDEV-17362: SIGSEGV in JOIN::optimize_inner or Assertion `fixed == 0' failed in Item_equal::fix_fields, server crashes after 2nd execution of PSbb-10.4-MDEV-17362
Move reinitialisation of pushdown variables for every query, because it used now not only for derived tables.
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index e8b092b1b23..197ead809eb 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -13445,8 +13445,10 @@ void JOIN::join_free()
void JOIN::cleanup(bool full)
{
DBUG_ENTER("JOIN::cleanup");
- DBUG_PRINT("enter", ("full %u", (uint) full));
-
+ DBUG_PRINT("enter", ("select: %d (%p) join: %p full: %u",
+ select_lex->select_number, select_lex, this,
+ (uint) full));
+
if (full)
have_query_plan= QEP_DELETED;