diff options
author | unknown <bell@sanja.is.com.ua> | 2004-08-23 15:50:59 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-08-23 15:50:59 +0300 |
commit | b948fb8c529b706afcb0e6e5026a84b6d8bacc13 (patch) | |
tree | 854dc364d536204325fe7a01afbb26c9ecffada9 /sql/item_subselect.h | |
parent | 3ae5c352a5cb3e04eea38c6cf8cee68fc23f98b5 (diff) | |
parent | f08b12caabfd963727be5b663b79f550996fcf83 (diff) | |
download | mariadb-git-b948fb8c529b706afcb0e6e5026a84b6d8bacc13.tar.gz |
merge
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/item_subselect.h')
-rw-r--r-- | sql/item_subselect.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index 1ce3144f660..f570d89f28f 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -48,6 +48,8 @@ protected: table_map used_tables_cache; /* allowed number of columns (1 for single value subqueries) */ uint max_columns; + /* where subquery is placed */ + enum_parsing_place parsing_place; /* work with 'substitution' */ bool have_to_be_excluded; /* cache of constant state */ |