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

Derived tables !

Browse Source 
mysql-test/r/union.result:
  small bug fixes in unions
BitKeeper/etc/ignore:
  Added Docs/manual.texi.orig Docs/manual.texi.rej to the ignore list
mysql-test/t/union.test:
  test for a bug fix in union's
sql/sql_union.cc:
  bug fix for unions
This commit is contained in:
unknown
2002-03-26 15:06:05 +02:00
parent c9ba7c5f21
commit 2ec108107d
13 changed files with 208 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_lex.h
View File

@ -101,7 +101,7 @@ typedef struct st_lex_master_info
} LEX_MASTER_INFO;
enum sub_select_type {UNSPECIFIED_TYPE,UNION_TYPE, INTERSECT_TYPE, EXCEPT_TYPE, NOT_A_SELECT};
enum sub_select_type {UNSPECIFIED_TYPE,UNION_TYPE, INTERSECT_TYPE, EXCEPT_TYPE, NOT_A_SELECT, DERIVED_TABLE_TYPE};
/* The state of the lex parsing for selects */
@ -120,7 +120,7 @@ typedef struct st_select_lex {
List<Item_func_match> ftfunc_list;
uint in_sum_expr, sort_default;
bool create_refs, braces;
st_select_lex *next;
st_select_lex *next, *prev;
} SELECT_LEX;
@ -141,7 +141,7 @@ public:
typedef struct st_lex {
uint yylineno,yytoklen; /* Simulate lex */
LEX_YYSTYPE yylval;
SELECT_LEX select_lex, *select;
SELECT_LEX select_lex, *select, *last_select;
uchar *ptr,*tok_start,*tok_end,*end_of_query;
char *length,*dec,*change,*name;
char *backup_dir; /* For RESTORE/BACKUP */
@ -185,7 +185,7 @@ typedef struct st_lex {
uint grant,grant_tot_col,which_columns, union_option, mqh;
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, derived_tables;
} LEX;