database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +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

4
sql/sql_load.cc
View File

@ -1,6 +1,6 @@
/*
Copyright (c) 2000, 2016, Oracle and/or its affiliates.
Copyright (c) 2010, 2016, MariaDB
Copyright (c) 2010, 2017, MariaDB Corporation
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -634,7 +634,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
DBUG_EXECUTE_IF("simulate_kill_bug27571",
{
error=1;
thd->killed= KILL_QUERY;
thd->set_killed(KILL_QUERY);
};);
#ifndef EMBEDDED_LIBRARY