Make SHOW EXPLAIN give a separate timeout error.
This commit is contained in:
parent
533e1d2845
commit
483ae4bf81
@ -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 */
|
||||||
|
if (timed_out)
|
||||||
|
{
|
||||||
|
my_error(ER_ERROR_WHEN_EXECUTING_COMMAND, MYF(0),
|
||||||
|
"SHOW EXPLAIN",
|
||||||
|
"Timeout");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
my_error(ER_ERROR_WHEN_EXECUTING_COMMAND, MYF(0),
|
my_error(ER_ERROR_WHEN_EXECUTING_COMMAND, MYF(0),
|
||||||
"SHOW EXPLAIN",
|
"SHOW EXPLAIN",
|
||||||
"Target is not running EXPLAINable command");
|
"Target is not running EXPLAINable command");
|
||||||
|
}
|
||||||
bres= TRUE;
|
bres= TRUE;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user