database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20953

Browse Source 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug20953
This commit is contained in:
kroki/tomash@moonlight.intranet
2006-10-12 18:06:26 +04:00
parent e1b5a2076f 591c06d4b7
commit 813431e9c9
8 changed files with 204 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sql/sql_lex.h
View File

@@ -866,6 +866,25 @@ public:
};
/*
st_parsing_options contains the flags for constructions that are
allowed in the current statement.
*/
struct st_parsing_options
{
bool allows_variable;
bool allows_select_into;
bool allows_select_procedure;
bool allows_derived;
st_parsing_options()
: allows_variable(TRUE), allows_select_into(TRUE),
allows_select_procedure(TRUE), allows_derived(TRUE)
{}
};
/* The state of the lex parsing. This is saved in the THD struct */
typedef struct st_lex : public Query_tables_list
@@ -1022,7 +1041,7 @@ typedef struct st_lex : public Query_tables_list
bool stmt_prepare_mode;
bool safe_to_cache_query;
bool subqueries, ignore;
bool variables_used;
st_parsing_options parsing_options;
ALTER_INFO alter_info;
/* Prepared statements SQL syntax:*/
LEX_STRING prepared_stmt_name; /* Statement name (in all queries) */