summaryrefslogtreecommitdiff
path: root/sql/sql_cte.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-06-08 11:09:49 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-06-08 11:09:49 +0300
commitbefb0bed68b555852e01859a846bf7ac40f15dbb (patch)
tree1698f0df44f4d5ad4ba1ff23314523179a94aac7 /sql/sql_cte.cc
parenta9bee9884aed7d9221bf028138349a1e7b5c984c (diff)
parentf458b40f66f33521ad3e4f0d4ebcbbcc501c89ed (diff)
downloadmariadb-git-befb0bed68b555852e01859a846bf7ac40f15dbb.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_cte.cc')
-rw-r--r--sql/sql_cte.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_cte.cc b/sql/sql_cte.cc
index 08d5e20f99a..a952f3b84b1 100644
--- a/sql/sql_cte.cc
+++ b/sql/sql_cte.cc
@@ -1114,6 +1114,7 @@ bool TABLE_LIST::set_as_with_table(THD *thd, With_element *with_elem)
{
derived= with_elem->spec;
if (derived != select_lex->master_unit() &&
+ !with_elem->is_recursive &&
!is_with_table_recursive_reference())
{
derived->move_as_slave(select_lex);