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

MDEV-6728 KILL QUERY executed on an idle connection can interrupt the next query

Browse Source 
reset KILL_QUERY when a new query execution is just about to be started
This commit is contained in:
Sergei Golubchik
2015-01-19 14:07:41 +01:00
parent b4cd8a8a5a
commit 56c323c10f
9 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_parse.cc
View File

@ -1124,6 +1124,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
thd->enable_slow_log= TRUE;
thd->query_plan_flags= QPLAN_INIT;
thd->lex->sql_command= SQLCOM_END; /* to avoid confusing VIEW detectors */
thd->reset_kill_query();
DEBUG_SYNC(thd,"dispatch_command_before_set_time");
@ -5111,11 +5112,7 @@ finish:
if (! thd->get_stmt_da()->is_set())
thd->send_kill_message();
}
if (thd->killed < KILL_CONNECTION)
{
thd->reset_killed();
thd->mysys_var->abort= 0;
}
thd->reset_kill_query();
}
if (thd->is_error() || (thd->variables.option_bits & OPTION_MASTER_SQL_ERROR))
trans_rollback_stmt(thd);