diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2016-02-18 17:20:48 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2016-02-21 22:16:17 +0100 |
| commit | 4b08b10b3ace67481cb7c03e0d3e95aaf6e954f7 (patch) | |
| tree | f83ac80eae1b5e5d7e7cfa80d13aebf3de26f54a /sql/item_subselect.cc | |
| parent | fd8e846a3b049903706267d58e6d8e61eea97df8 (diff) | |
| download | mariadb-git-4b08b10b3ace67481cb7c03e0d3e95aaf6e954f7.tar.gz | |
MDEV-9489:Assertion `0' failed in Protocol::end_statement() on UNION ALL
Restoring currect_select fixed.
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 2 |
1 files changed, 2 insertions, 0 deletions
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); } |