Merge of the patch introducing virtual columns into maria-5.2

This commit is contained in:
Igor Babaev 2009-11-11 20:31:28 -08:00
commit e4e1ae0d13
300 changed files with 28401 additions and 1297 deletions

View file

@ -1546,6 +1546,7 @@ typedef struct st_lex : public Query_tables_list
LEX_USER *grant_user;
XID *xid;
THD *thd;
Virtual_column_info *vcol_info;
/* maintain a list of used plugins for this LEX */
DYNAMIC_ARRAY plugins;
@ -1628,6 +1629,14 @@ typedef struct st_lex : public Query_tables_list
syntax error back.
*/
bool expr_allows_subselect;
/*
A special command "PARSE_VCOL_EXPR" is defined for the parser
to translate a defining expression of a virtual column into an
Item object.
The following flag is used to prevent other applications to use
this command.
*/
bool parse_vcol_expr;
thr_lock_type lock_option;
enum SSL_type ssl_type; /* defined in violite.h */