diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-05 12:15:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-05 12:15:17 +0200 |
| commit | d63e19806108efc1ca8d533841ad2471f2e0c4fe (patch) | |
| tree | e7f63499d0768e3af50b5c576048adbd84f4786f /include/mysql | |
| parent | 6472c5c015a174ffd680fddc8f20c7a94684a552 (diff) | |
| parent | 03977e8273cbd33c3cbfec191ceee856f973ce1a (diff) | |
| download | mariadb-git-d63e19806108efc1ca8d533841ad2471f2e0c4fe.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'include/mysql')
| -rw-r--r-- | include/mysql/service_kill_statement.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql/service_kill_statement.h b/include/mysql/service_kill_statement.h index 995b21f0a9f..bfb222301eb 100644 --- a/include/mysql/service_kill_statement.h +++ b/include/mysql/service_kill_statement.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Monty Program Ab. +/* Copyright (c) 2013, 2018, MariaDB 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 @@ -27,7 +27,7 @@ time-consuming loops, and gracefully abort the operation if it is non-zero. - thd_is_killed(thd) + thd_killed(thd) @return 0 - no KILL statement was issued, continue normally @return 1 - there was a KILL statement, abort the execution. |