mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Bug#33146 CHECKSUM TABLE is not interruptable by KILL
QUERY statement Commit 55629 applied to 5.0-bugteam and 5.1-bugteam: Check for thd->killed in CHECKSUM loop.
This commit is contained in:
parent
f8b219ee29
commit
e1b22ab9a1
1 changed files with 10 additions and 0 deletions
|
@ -4376,6 +4376,16 @@ bool mysql_checksum_table(THD *thd, TABLE_LIST *tables, HA_CHECK_OPT *check_opt)
|
|||
{
|
||||
for (;;)
|
||||
{
|
||||
if (thd->killed)
|
||||
{
|
||||
/*
|
||||
we've been killed; let handler clean up, and remove the
|
||||
partial current row from the recordset (embedded lib)
|
||||
*/
|
||||
t->file->ha_rnd_end();
|
||||
thd->protocol->remove_last_row();
|
||||
goto err;
|
||||
}
|
||||
ha_checksum row_crc= 0;
|
||||
int error= t->file->rnd_next(t->record[0]);
|
||||
if (unlikely(error))
|
||||
|
|
Loading…
Reference in a new issue