Merge branch '10.4' into 10.5

1 files changed, 20 insertions, 0 deletions

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 5784c10a29c..5a39b380855 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -11613,3 +11613,23 @@ bool LEX::map_data_type(const Lex_ident_sys_st &schema_name,
   type->set_handler(mapped);
   return false;
 }
+
+
+bool SELECT_LEX_UNIT::explainable() const
+{
+  /*
+    EXPLAIN/ANALYZE unit, when:
+    (1) if it's a subquery - it's not part of eliminated WHERE/ON clause.
+    (2) if it's a CTE - it's not hanging (needed for execution)
+    (3) if it's a derived - it's not merged
+    if it's not 1/2/3 - it's some weird internal thing, ignore it
+  */
+  return item ?
+           !item->eliminated :                        // (1)
+           with_element ?
+             derived && derived->derived_result &&
+               !with_element->is_hanging_recursive(): // (2)
+             derived ?
+               derived->is_materialized_derived() :   // (3)
+               false;
+}