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

Code cleanup

Browse Source
This commit is contained in:
Sergei Petrunia
2014-06-26 10:43:58 +04:00
parent 18d5a748f1
commit 68bf3c5052
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_select.cc
View File

@@ -2387,17 +2387,6 @@ void JOIN::exec()
); );
exec_inner(); exec_inner();
if (!exec_saved_explain)
{
#if 0
save_explain_data(thd->lex->explain, true /* can overwrite */,
need_tmp,
order != 0 && !skip_sort_order,
select_distinct);
#endif
exec_saved_explain= true;
}
DBUG_EXECUTE_IF("show_explain_probe_join_exec_end", DBUG_EXECUTE_IF("show_explain_probe_join_exec_end",
if (dbug_user_var_equals_int(thd, if (dbug_user_var_equals_int(thd,
"show_explain_probe_select_id", "show_explain_probe_select_id",

8
sql/sql_select.h
View File

@@ -1349,7 +1349,6 @@ public:
sjm_lookup_tables= 0; sjm_lookup_tables= 0;
filesort_found_rows= false; filesort_found_rows= false;
exec_saved_explain= false;
/* /*
The following is needed because JOIN::cleanup(true) may be called for The following is needed because JOIN::cleanup(true) may be called for
joins for which JOIN::optimize was aborted with an error before a proper joins for which JOIN::optimize was aborted with an error before a proper
@@ -1358,13 +1357,6 @@ public:
table_access_tabs= NULL; table_access_tabs= NULL;
} }
/*
TRUE <=> There was a JOIN::exec() call, which saved this JOIN's EXPLAIN.
The idea is that we also save at the end of JOIN::optimize(), but that
might not be the final plan.
*/
bool exec_saved_explain;
int prepare(Item ***rref_pointer_array, TABLE_LIST *tables, uint wind_num, int prepare(Item ***rref_pointer_array, TABLE_LIST *tables, uint wind_num,
COND *conds, uint og_num, ORDER *order, bool skip_order_by, COND *conds, uint og_num, ORDER *order, bool skip_order_by,
ORDER *group, Item *having, ORDER *proc_param, SELECT_LEX *select, ORDER *group, Item *having, ORDER *proc_param, SELECT_LEX *select,