Merge branch '10.3' into 10.4

1 files changed, 7 insertions, 7 deletions

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 10cd20e1207..e196765b6bc 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -4831,14 +4831,14 @@ void st_select_lex::set_explain_type(bool on_the_fly)
               /*
                 pos_in_table_list=NULL for e.g. post-join aggregation JOIN_TABs.
               */
-              if (!tab->table);
-              else if (const TABLE_LIST *pos= tab->table->pos_in_table_list)
+              if (!(tab->table && tab->table->pos_in_table_list))
+	        continue;
+              TABLE_LIST *tbl= tab->table->pos_in_table_list;
+              if (tbl->with && tbl->with->is_recursive &&
+                  tbl->is_with_table_recursive_reference())
               {
-                if (pos->with && pos->with->is_recursive)
-                {
-                  uses_cte= true;
-                  break;
-                }
+                uses_cte= true;
+                break;
               }
             }
             if (uses_cte)