mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Merge 10.10 into 10.11
This commit is contained in:
@@ -493,7 +493,7 @@ public:
|
||||
bool is_analyze);
|
||||
|
||||
/* Send tabular EXPLAIN to the client */
|
||||
int send_explain(THD *thd);
|
||||
int send_explain(THD *thd, bool extended);
|
||||
|
||||
/* Return tabular EXPLAIN output as a text string */
|
||||
bool print_explain_str(THD *thd, String *out_str, bool is_analyze);
|
||||
@@ -753,7 +753,7 @@ public:
|
||||
class Explain_table_access : public Sql_alloc
|
||||
{
|
||||
public:
|
||||
Explain_table_access(MEM_ROOT *root) :
|
||||
Explain_table_access(MEM_ROOT *root, bool timed) :
|
||||
derived_select_number(0),
|
||||
non_merged_sjm_number(0),
|
||||
extra_tags(root),
|
||||
@@ -766,6 +766,7 @@ public:
|
||||
pushed_index_cond(NULL),
|
||||
sjm_nest(NULL),
|
||||
pre_join_sort(NULL),
|
||||
jbuf_unpack_tracker(timed),
|
||||
rowid_filter(NULL)
|
||||
{}
|
||||
~Explain_table_access() { delete sjm_nest; }
|
||||
@@ -873,8 +874,22 @@ public:
|
||||
Exec_time_tracker op_tracker;
|
||||
Gap_time_tracker extra_time_tracker;
|
||||
|
||||
/* When using join buffer: Track the reads from join buffer */
|
||||
Table_access_tracker jbuf_tracker;
|
||||
|
||||
|
||||
/* When using join buffer: time spent unpacking rows from the join buffer */
|
||||
Time_and_counter_tracker jbuf_unpack_tracker;
|
||||
|
||||
/*
|
||||
When using join buffer: time spent after unpacking rows from the join
|
||||
buffer. This will capture the time spent checking the Join Condition:
|
||||
the condition that depends on this table and preceding tables.
|
||||
*/
|
||||
Gap_time_tracker jbuf_extra_time_tracker;
|
||||
|
||||
/* When using join buffer: Track the number of incoming record combinations */
|
||||
Counter_tracker jbuf_loops_tracker;
|
||||
|
||||
Explain_rowid_filter *rowid_filter;
|
||||
|
||||
int print_explain(select_result_sink *output, uint8 explain_flags,
|
||||
|
Reference in New Issue
Block a user