diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-25 13:27:11 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-25 13:27:11 +0200 |
| commit | ae476868a5394041a00e75a29c7d45917e8dfae8 (patch) | |
| tree | b2f82005fe87bc5ce1ea92504b505a9d4e8b9781 /sql/sql_delete.cc | |
| parent | 8d0dabc56b09c6b40db15aac7da0da43d988759d (diff) | |
| parent | 2536c0b1ebf6c5012ae34435d82fb2f5fa54aea5 (diff) | |
| download | mariadb-git-ae476868a5394041a00e75a29c7d45917e8dfae8.tar.gz | |
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index d23c9c87ffa..ab02c3f9cca 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -1,6 +1,6 @@ /* - Copyright (c) 2000, 2010, Oracle and/or its affiliates. - Copyright (c) 2010, 2015, MariaDB + Copyright (c) 2000, 2019, Oracle and/or its affiliates. + Copyright (c) 2010, 2019, 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 @@ -1324,6 +1324,7 @@ bool multi_delete::send_eof() thd->clear_error(); else errcode= query_error_code(thd, killed_status == NOT_KILLED); + thd->thread_specific_used= TRUE; if (thd->binlog_query(THD::ROW_QUERY_TYPE, thd->query(), thd->query_length(), transactional_tables, FALSE, FALSE, errcode) && |