From 129098b70ce4a30bad600ea4dc2703e4edadfe88 Mon Sep 17 00:00:00 2001 From: Dmitry Shulga Date: Tue, 11 May 2021 15:16:55 +0700 Subject: [PATCH] MDEV-16708: Unsupported commands for prepared statements Fixed the bug in handling queries where select list contains subqueries with items referencing to items in outer query --- sql/item.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/item.cc b/sql/item.cc index 252135f50adf7..a016f04953cfa 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -5531,7 +5531,7 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference) */ Name_resolution_context *last_checked_context= context; Item **ref= (Item **) not_found_item; - SELECT_LEX *current_sel= thd->lex->current_select; + SELECT_LEX *current_sel= context->select_lex; Name_resolution_context *outer_context= 0; SELECT_LEX *select= 0; @@ -5868,7 +5868,7 @@ bool Item_field::fix_fields(THD *thd, Item **reference) DBUG_ASSERT(fixed() == 0); Field *from_field= (Field *)not_found_field; bool outer_fixed= false; - SELECT_LEX *select= thd->lex->current_select; + SELECT_LEX *select= context->select_lex; if (select && select->in_tvc) {