mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge
BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged sql/Makefile.am: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/item.cc: SCCS merged sql/item.h: SCCS merged sql/lex.h: SCCS merged sql/sql_lex.cc: SCCS merged sql/sql_lex.h: SCCS merged
This commit is contained in:
@ -21,6 +21,9 @@
|
||||
class Table_ident;
|
||||
class sql_exchange;
|
||||
class LEX_COLUMN;
|
||||
class sp_head;
|
||||
class sp_instr;
|
||||
class sp_pcontext;
|
||||
|
||||
/*
|
||||
The following hack is needed because mysql_yacc.cc does not define
|
||||
@ -72,6 +75,8 @@ enum enum_sql_command {
|
||||
SQLCOM_SHOW_WARNS, SQLCOM_EMPTY_QUERY, SQLCOM_SHOW_ERRORS,
|
||||
SQLCOM_SHOW_COLUMN_TYPES, SQLCOM_SHOW_TABLE_TYPES, SQLCOM_SHOW_PRIVILEGES,
|
||||
SQLCOM_HELP,
|
||||
SQLCOM_CREATE_PROCEDURE, SQLCOM_CALL, SQLCOM_DROP_PROCEDURE,
|
||||
SQLCOM_ALTER_PROCEDURE,
|
||||
|
||||
/* This should be the last !!! */
|
||||
SQLCOM_END
|
||||
@ -404,6 +409,7 @@ typedef struct st_lex
|
||||
SELECT_LEX_NODE *current_select;
|
||||
/* list of all SELECT_LEX */
|
||||
SELECT_LEX *all_selects_list;
|
||||
uchar *buf; /* The beginning of string, used by SPs */
|
||||
uchar *ptr,*tok_start,*tok_end,*end_of_query;
|
||||
char *length,*dec,*change,*name;
|
||||
char *backup_dir; /* For RESTORE/BACKUP */
|
||||
@ -462,6 +468,8 @@ typedef struct st_lex
|
||||
CHARSET_INFO *charset;
|
||||
char *help_arg;
|
||||
bool tmp_table_used;
|
||||
sp_head *sphead;
|
||||
sp_pcontext *spcont;
|
||||
} LEX;
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user