diff options
| author | igor@rurik.mysql.com <> | 2004-10-19 14:12:55 -0700 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2004-10-19 14:12:55 -0700 |
| commit | 4c8e3917186ad416effa97bce402b9bb55a9f7b5 (patch) | |
| tree | c8ad94f9dcfef78444654591bbc8908882995ed5 /sql/sql_select.h | |
| parent | 71f6ab7a09fa8cb225315f74caae6b507af9a029 (diff) | |
| download | mariadb-git-4c8e3917186ad416effa97bce402b9bb55a9f7b5.tar.gz | |
table.h, sql_select.h:
Added the code processing on expressions for applying
multiple equalities.
sql_select.cc:
Post-merge fixes for Item_equal patch.
Added the code processing on expressions for applying
multiple equalities.
Many files:
Post-merge fixes for Item_equal patch.
item_cmpfunc.cc:
Post-merge fixes for Item_equal patch.
Fixed a problem when an equality field=const cannot be applied to
the predicate P(field,c) for constant propagation as a conversion
of field is needed.
item.h, item.cc:
Fixed a problem when an equality field=const cannot be applied to
the predicate P(field,c) for constant propagation as a conversion
of field is needed.
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index c9cfeb70225..18664624a77 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -91,7 +91,8 @@ typedef struct st_join_table { SQL_SELECT *select; COND *select_cond; QUICK_SELECT_I *quick; - Item *on_expr; /* associated on expression */ + Item **on_expr_ref; /* pointer to the associated on expression */ + COND_EQUAL *cond_equal; /* multiple equalities for the on expression */ st_join_table *first_inner; /* first inner table for including outerjoin */ bool found; /* true after all matches or null complement */ bool not_null_compl;/* true before null complement is added */ |