Merge 10.3 into 10.4

1 files changed, 16 insertions, 0 deletions

diff --git a/sql/item.cc b/sql/item.cc
index f3eb7bcd741..73390e3d6e1 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -9773,6 +9773,8 @@ bool Item_trigger_field::set_value(THD *thd, sp_rcontext * /*ctx*/, Item **it)
 
   if (!item || fix_fields_if_needed(thd, NULL))
     return true;
+  if (field->vers_sys_field())
+    return false;
 
   // NOTE: field->table->copy_blobs should be false here, but let's
   // remember the value at runtime to avoid subtle bugs.
@@ -10607,6 +10609,20 @@ void view_error_processor(THD *thd, void *data)
   ((TABLE_LIST *)data)->hide_view_error(thd);
 }
 
+/**
+  Name resolution context with resolution in only one table
+*/
+
+Name_resolution_context::Name_resolution_context(TABLE_LIST *table):
+  outer_context(0), table_list(0), select_lex(0),
+  error_processor_data(0),
+  security_ctx(0)
+{
+  resolve_in_select_list= FALSE;
+  error_processor= &dummy_error_processor;
+  // resolve only in this table
+  first_name_resolution_table= last_name_resolution_table= table;
+}
 
 st_select_lex *Item_ident::get_depended_from() const
 {