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

Merge mariadb-5.5 -> 10.0-base.

Browse Source
This commit is contained in:
Igor Babaev
2012-12-16 16:49:19 -08:00
parent 40bbf697aa b8b875cb79
commit 7760efad74
303 changed files with 12801 additions and 2087 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@ -6878,8 +6878,10 @@ void sql_kill(THD *thd, ulong id, killed_state state)
uint error;
if (!(error= kill_one_thread(thd, id, state)))
{
if (! thd->killed)
if ((!thd->killed))
my_ok(thd);
else
my_error(killed_errno(thd->killed), MYF(0), id);
}
else
my_error(error, MYF(0), id);