diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 12:49:19 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 12:49:19 +0200 |
commit | 09a1f0075a8d5752dd7b2940a20d86a040af1741 (patch) | |
tree | 42c96cf95d5df2950b77329c76c0024f33088aff /sql/table.h | |
parent | e6f95b23f425001a14a528256354e0faf4e272f6 (diff) | |
parent | 440d4b282dd4992d64abdd6289859598db7e5f75 (diff) | |
download | mariadb-git-09a1f0075a8d5752dd7b2940a20d86a040af1741.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/table.h')
-rw-r--r-- | sql/table.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index 63bcc69b6bc..71884c919ad 100644 --- a/sql/table.h +++ b/sql/table.h @@ -2244,7 +2244,6 @@ struct TABLE_LIST parsing 'this' is a NATURAL/USING join iff (natural_join != NULL). */ TABLE_LIST *natural_join; - bool part_of_natural_join; /* True if 'this' represents a nested join that is a NATURAL JOIN. For one of the operands of 'this', the member 'natural_join' points |