From 4b08b10b3ace67481cb7c03e0d3e95aaf6e954f7 Mon Sep 17 00:00:00 2001 From: Oleksandr Byelkin Date: Thu, 18 Feb 2016 17:20:48 +0100 Subject: MDEV-9489:Assertion `0' failed in Protocol::end_statement() on UNION ALL Restoring currect_select fixed. --- sql/item_subselect.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sql/item_subselect.cc') diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index d4e3e6c5e7a..a5ef81eee76 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -5328,6 +5328,7 @@ int subselect_hash_sj_engine::exec() item_in->reset(); item_in->make_const(); item_in->set_first_execution(); + thd->lex->current_select= save_select; DBUG_RETURN(FALSE); } @@ -5371,6 +5372,7 @@ int subselect_hash_sj_engine::exec() item_in->null_value= 1; item_in->make_const(); item_in->set_first_execution(); + thd->lex->current_select= save_select; DBUG_RETURN(FALSE); } -- cgit v1.2.1