mirror of
https://github.com/MariaDB/server.git
synced 2026-04-28 19:25:32 +02:00
Merge with 5.1 to get in changes from MySQL 5.1.55
This commit is contained in:
commit
3358cdd504
1605 changed files with 28760 additions and 44097 deletions
|
|
@ -1734,14 +1734,8 @@ typedef struct st_lex : public Query_tables_list
|
|||
bool verbose, no_write_to_binlog;
|
||||
|
||||
bool tx_chain, tx_release;
|
||||
/*
|
||||
Special JOIN::prepare mode: changing of query is prohibited.
|
||||
When creating a view, we need to just check its syntax omitting
|
||||
any optimizations: afterwards definition of the view will be
|
||||
reconstructed by means of ::print() methods and written to
|
||||
to an .frm file. We need this definition to stay untouched.
|
||||
*/
|
||||
bool view_prepare_mode;
|
||||
|
||||
uint8 context_analysis_only;
|
||||
bool safe_to_cache_query;
|
||||
bool subqueries, ignore;
|
||||
st_parsing_options parsing_options;
|
||||
|
|
@ -1867,6 +1861,13 @@ typedef struct st_lex : public Query_tables_list
|
|||
delete_dynamic(&plugins);
|
||||
}
|
||||
|
||||
inline bool is_ps_or_view_context_analysis()
|
||||
{
|
||||
return (context_analysis_only &
|
||||
(CONTEXT_ANALYSIS_ONLY_PREPARE |
|
||||
CONTEXT_ANALYSIS_ONLY_VIEW));
|
||||
}
|
||||
|
||||
inline void uncacheable(uint8 cause)
|
||||
{
|
||||
safe_to_cache_query= 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue