summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-07-31 18:10:03 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-07-31 18:10:03 +0300
commit4db4b773653eacba029631363ef1abdd5242b71a (patch)
tree8c7d7996ec463aede9c90db55d6fb53b94bc43fe /sql/sql_parse.cc
parent70d4500c00050cf902348c28c70c9eb3eda7de50 (diff)
parenta8458a2345ea2497ada2f1bd01aeb9c34934dfc6 (diff)
downloadmariadb-git-4db4b773653eacba029631363ef1abdd5242b71a.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index fbfb0449989..bf33148811e 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -8991,6 +8991,8 @@ void add_join_natural(TABLE_LIST *a, TABLE_LIST *b, List<String> *using_fields,
SELECT_LEX *lex)
{
b->natural_join= a;
+ a->part_of_natural_join= TRUE;
+ b->part_of_natural_join= TRUE;
lex->prev_join_using= using_fields;
}