database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2017-08-17 11:32:16 +02:00
parent a4885dde4c 48fe832650
commit cb1e76e4de
360 changed files with 40976 additions and 2803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_update.cc
View File

@ -918,7 +918,7 @@ int mysql_update(THD *thd,
// simulated killing after the loop must be ineffective for binlogging
DBUG_EXECUTE_IF("simulate_kill_bug27571",
{
thd->killed= KILL_QUERY;
thd->set_killed(KILL_QUERY);
};);
error= (killed_status == NOT_KILLED)? error : 1;