summaryrefslogtreecommitdiff
path: root/sql/sql_select.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-11-06 16:24:16 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-11-06 16:24:16 +0200
commit074c68409921032f8a64416cc4d5ebc35d95dca9 (patch)
tree615c99d326fd2ce8c0e3b533b40f0e4e3475bbc1 /sql/sql_select.h
parent563efeceece09154f71da6303244b1df36875428 (diff)
parentdf563e0c037f9b2cdb22e145575f92a121b4b529 (diff)
downloadmariadb-git-074c68409921032f8a64416cc4d5ebc35d95dca9.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r--sql/sql_select.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 4140a0293f8..e2c78473b1a 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -263,8 +263,12 @@ typedef struct st_join_table {
/*
Pointer to the associated ON expression. on_expr_ref=!NULL except for
degenerate joins.
- *on_expr_ref!=NULL for tables that are first inner tables within an outer
- join.
+
+ Optimization phase: *on_expr_ref!=NULL for tables that are the single
+ tables on the inner side of the outer join (t1 LEFT JOIN t2 ON...)
+
+ Execution phase: *on_expr_ref!=NULL for tables that are first inner tables
+ within an outer join (which may have multiple tables)
*/
Item **on_expr_ref;
COND_EQUAL *cond_equal; /**< multiple equalities for the on expression */