database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Just making commit in order to stop getting erors.

Browse Source 
Will do a push when it starts working ..
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2002-07-16 22:42:53 +03:00
parent 6377f501df
commit c5738005c4
8 changed files with 64 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_lex.h
View File

@ -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 */
@ -178,7 +184,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;