mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Fix for bug #9632 (strict.test fails in -embedded-server mode)
This commit is contained in:
@ -1433,9 +1433,6 @@ bool do_command(THD *thd)
|
||||
}
|
||||
else
|
||||
{
|
||||
if (thd->killed == THD::KILL_QUERY || thd->killed == THD::KILL_BAD_DATA)
|
||||
thd->killed= THD::NOT_KILLED;
|
||||
|
||||
packet=(char*) net->read_pos;
|
||||
command = (enum enum_server_command) (uchar) packet[0];
|
||||
if (command >= COM_END)
|
||||
@ -1482,6 +1479,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
|
||||
bool error= 0;
|
||||
DBUG_ENTER("dispatch_command");
|
||||
|
||||
if (thd->killed == THD::KILL_QUERY || thd->killed == THD::KILL_BAD_DATA)
|
||||
thd->killed= THD::NOT_KILLED;
|
||||
|
||||
thd->command=command;
|
||||
/*
|
||||
Commands which will always take a long time should be marked with
|
||||
|
Reference in New Issue
Block a user