diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-07-16 22:45:59 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-07-16 22:45:59 +0300 |
| commit | b3905034edf31200567793b8a4c453a2e63edf12 (patch) | |
| tree | 3d50fdb9649350943d1069b28df523b8557debfa /sql/sql_lex.h | |
| parent | 419cec8d4693db8d051d7bf324c27d977cdc420d (diff) | |
| parent | 63a49b788669b23da48029774e931621aae2dc51 (diff) | |
| download | mariadb-git-b3905034edf31200567793b8a4c453a2e63edf12.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_lex.h:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 305e3e44cbc..8a3125aa9ca 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -89,7 +89,12 @@ typedef struct st_lex_master_info enum sub_select_type { - UNSPECIFIED_TYPE, UNION_TYPE, INTERSECT_TYPE, EXCEPT_TYPE, NOT_A_SELECT + UNSPECIFIED_TYPE, UNION_TYPE, INTERSECT_TYPE, EXCEPT_TYPE, OLAP_TYPE, NOT_A_SELECT +}; + +enum olap_type +{ + NON_EXISTING_ONE, CUBE_TYPE, ROLLUP_TYPE }; /* The state of the lex parsing for selects */ @@ -97,6 +102,7 @@ enum sub_select_type typedef struct st_select_lex { enum sub_select_type linkage; + enum olap_type olap; char *db,*db1,*table1,*db2,*table2; /* For outer join using .. */ Item *where,*having; ha_rows select_limit,offset_limit; @@ -133,7 +139,7 @@ typedef struct st_lex { uint yylineno,yytoklen; /* Simulate lex */ LEX_YYSTYPE yylval; - SELECT_LEX select_lex, *select; + SELECT_LEX select_lex, *select, *last_selects; uchar *ptr,*tok_start,*tok_end,*end_of_query; char *length,*dec,*change,*name; char *backup_dir; /* For RESTORE/BACKUP */ @@ -179,7 +185,7 @@ typedef struct st_lex uint grant,grant_tot_col,which_columns, union_option; thr_lock_type lock_option; bool drop_primary,drop_if_exists,local_file; - bool in_comment,ignore_space,verbose,simple_alter, option_type; + bool in_comment,ignore_space,verbose,simple_alter, option_type, olap; uint slave_thd_opt; } LEX; |