revision-id: 9892a3b4fda4c34d35643f5c7e037fbaee775ae6 (mariadb-10.5.2-429-g9892a3b4fda) parent(s): bbc62d491f523ed84efcfcc73436005d39f77a90 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-03-12 21:58:51 +0300 message: JSON_TABLE: undo the changes that are no longer relevant --- sql/table.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sql/table.cc b/sql/table.cc index 9c205fc4be6..6f4fd1af3f8 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -6722,8 +6722,6 @@ Item *create_view_field(THD *thd, TABLE_LIST *view, Item **field_ref, LEX_CSTRING *name) { bool save_wrapper= thd->lex->first_select_lex()->no_wrap_view_item; - bool *wrapper_to_set= thd->lex->current_select ? - &thd->lex->current_select->no_wrap_view_item : &save_wrapper; Item *field= *field_ref; DBUG_ENTER("create_view_field"); @@ -6739,17 +6737,17 @@ Item *create_view_field(THD *thd, TABLE_LIST *view, Item **field_ref, } DBUG_ASSERT(field); - *wrapper_to_set= TRUE; + thd->lex->current_select->no_wrap_view_item= TRUE; if (!field->is_fixed()) { if (field->fix_fields(thd, field_ref)) { - *wrapper_to_set= save_wrapper; + thd->lex->current_select->no_wrap_view_item= save_wrapper; DBUG_RETURN(0); } field= *field_ref; } - *wrapper_to_set= save_wrapper; + thd->lex->current_select->no_wrap_view_item= save_wrapper; if (save_wrapper) { DBUG_RETURN(field);