mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-29 19:55:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.1' into bb-10.1-merge

Browse source
This commit is contained in:
Sergei Golubchik 2014-12-03 11:37:26 +01:00
commit ec4137c62b
47 changed files with 3412 additions and 692 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/sql_lex.h
View file

@ -2312,8 +2312,9 @@ public:
void set_impossible_where() { impossible_where= true; }
void set_no_partitions() { no_partitions= true; }
void save_explain_data(Explain_query *query);
void save_explain_data_intern(Explain_query *query, Explain_update *eu);
void save_explain_data(MEM_ROOT *mem_root, Explain_query *query);
void save_explain_data_intern(MEM_ROOT *mem_root, Explain_query *query,
Explain_update *eu);
virtual ~Update_plan() {}
@ -2344,7 +2345,7 @@ public:
scanned_rows= rows_arg;
}
void save_explain_data(Explain_query *query);
void save_explain_data(MEM_ROOT *mem_root, Explain_query *query);
};
@ -2509,6 +2510,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