1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make SHOW EXPLAIN give a separate timeout error.

Browse Source
This commit is contained in:
Sergey Petrunya 2012-05-16 20:22:54 +04:00
parent 533e1d2845
commit 483ae4bf81
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_show.cc
View File

@ -2121,9 +2121,18 @@ void mysqld_show_explain(THD *thd, ulong thread_id)
if (bres || explain_req.failed_to_produce) if (bres || explain_req.failed_to_produce)
{ {
/* TODO not enabled or time out */ /* TODO not enabled or time out */
my_error(ER_ERROR_WHEN_EXECUTING_COMMAND, MYF(0), if (timed_out)
"SHOW EXPLAIN", {
"Target is not running EXPLAINable command"); my_error(ER_ERROR_WHEN_EXECUTING_COMMAND, MYF(0),
"SHOW EXPLAIN",
"Timeout");
}
else
{
my_error(ER_ERROR_WHEN_EXECUTING_COMMAND, MYF(0),
"SHOW EXPLAIN",
"Target is not running EXPLAINable command");
}
bres= TRUE; bres= TRUE;
} }
else else