database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

- Testing: add DBUG_EXECUTE_IF("show_explain_probe_2"... which fires

Browse Source 
only for selects with given select_id.
- Steps towards making SHOW EXPLAIN work for UNIONs.
This commit is contained in:
Sergey Petrunya
2011-09-25 13:05:58 +04:00
parent 203bbfe569
commit 27f760143c
6 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
sql/sql_select.cc
View File

@ -262,8 +262,34 @@ void dbug_serve_apcs(THD *thd, int n_calls)
}
thd_proc_info(thd, save_proc_info);
}
/*
Usage
DBUG_EXECUTE_IF("show_explain_probe_2",
if (dbug_user_var_equals_int(thd, "select_id", select_id))
dbug_serve_apcs(thd, 1);
);
*/
bool dbug_user_var_equals_int(THD *thd, const char *name, int value)
{
user_var_entry *var;
LEX_STRING varname= {(char*)name, strlen(name)};
if ((var= get_variable(&thd->user_vars, varname, FALSE)))
{
bool null_value;
longlong var_value= var->val_int(&null_value);
if (!null_value && var_value == value)
return TRUE;
}
return FALSE;
}
#endif
/**
This handles SELECT with and without UNION.
*/
@ -2067,7 +2093,13 @@ void JOIN::exec_inner()
int tmp_error;
DBUG_ENTER("JOIN::exec");
DBUG_EXECUTE_IF("show_explain_probe_1", dbug_serve_apcs(thd, 1););
DBUG_EXECUTE_IF("show_explain_probe_2", dbug_serve_apcs(thd, 1););
DBUG_EXECUTE_IF("show_explain_probe_1",
if (dbug_user_var_equals_int(thd,
"show_explain_probe_select_id",
select_lex->select_number))
dbug_serve_apcs(thd, 1);
);
thd_proc_info(thd, "executing");
error= 0;
@ -20397,8 +20429,8 @@ void JOIN::clear()
/**
EXPLAIN handling.
Send a description about what how the select will be done to stdout.
Produce lines explaining execution of *this* select (not including children
selects)
@param on_the_fly TRUE <=> we're being executed on-the-fly, so don't make
modifications to any select's data structures
*/