database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

References: lp:1066784 - Merged with MariaDB 5.5.28a

Browse Source 
bzr merge -r tag:mariadb-5.5.28a lp:maria/5.5
...no conflicts
This commit is contained in:
Seppo Jaakola
2012-11-30 13:36:29 +02:00
parent fc6cd855e9 7c5f62a313
commit 4df29fef36
133 changed files with 4960 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@ -7264,8 +7264,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);