Merge 10.3 into 10.4bb-10.4-merge

1 files changed, 21 insertions, 0 deletions

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index c840ae6990c..5937c43c95d 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -5047,6 +5047,27 @@ bool st_select_lex::save_prep_leaf_tables(THD *thd)
 }
 
 
+/**
+  Set exclude_from_table_unique_test for selects of this select and all selects
+  belonging to the underlying units of derived tables or views
+*/
+
+void st_select_lex::set_unique_exclude()
+{
+  exclude_from_table_unique_test= TRUE;
+  for (SELECT_LEX_UNIT *unit= first_inner_unit();
+       unit;
+       unit= unit->next_unit())
+  {
+    if (unit->derived && unit->derived->is_view_or_derived())
+    {
+      for (SELECT_LEX *sl= unit->first_select(); sl; sl= sl->next_select())
+        sl->set_unique_exclude();
+    }
+  }
+}
+
+
 /*
   Return true if this select_lex has been converted into a semi-join nest
   within 'ancestor'.