Merge ../10.1-explain-json-r4 into 10.1

This commit is contained in:
Sergei Petrunia 2014-11-27 00:51:54 +03:00
commit 3d5f97fd70
21 changed files with 1335 additions and 155 deletions

View file

@ -2500,6 +2500,7 @@ struct LEX: public Query_tables_list
uint table_count;
uint8 describe;
bool analyze_stmt; /* TRUE<=> this is "ANALYZE $stmt" */
bool explain_json;
/*
A flag that indicates what kinds of derived tables are present in the
query (0 if no derived tables, otherwise a combination of flags