summaryrefslogtreecommitdiff
path: root/sql/sql_cte.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-11-08 09:39:37 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-11-08 09:39:37 +0200
commit2767cb76d4b55818eac11100cca208b54f79d1fd (patch)
tree4bfb274f90ebf9990c45918f0db91294304c79ec /sql/sql_cte.cc
parenta91109846c74a69bfa0fef054954ac9ae675765e (diff)
parent4142589207649e3317adc8c0d371897b7cb53733 (diff)
downloadmariadb-git-2767cb76d4b55818eac11100cca208b54f79d1fd.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_cte.cc')
-rw-r--r--sql/sql_cte.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_cte.cc b/sql/sql_cte.cc
index b05a688f40e..24fd2c60503 100644
--- a/sql/sql_cte.cc
+++ b/sql/sql_cte.cc
@@ -1278,7 +1278,7 @@ bool With_element::check_unrestricted_recursive(st_select_lex *sel,
With_element *with_elem= unit->with_element;
if (encountered & with_elem->get_elem_map())
unrestricted|= with_elem->mutually_recursive;
- else
+ else if (with_elem ==this)
encountered|= with_elem->get_elem_map();
}
}