diff options
| author | Nisha Gopalakrishnan <nisha.gopalakrishnan@oracle.com> | 2015-01-27 13:13:55 +0530 |
|---|---|---|
| committer | Nisha Gopalakrishnan <nisha.gopalakrishnan@oracle.com> | 2015-01-27 13:13:55 +0530 |
| commit | aa1de7372846e3a37c87b7488d34426264d7da44 (patch) | |
| tree | 0949f08132016a052d7340f46093e771c1e31580 /sql/sql_base.cc | |
| parent | 7a408dbdf40930144c1bad654cb1e31e5ce5fc7a (diff) | |
| download | mariadb-git-aa1de7372846e3a37c87b7488d34426264d7da44.tar.gz | |
Bug#20094067: BACKPORT BUG#19683834 TO 5.5 AND 5.6
Backporting the patch and the test case fixed as part
of BUG#16041903 and BUG#19683834 respectively.
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 040c0425577..f7405fb63b8 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. 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 @@ -4019,7 +4019,7 @@ request_backoff_action(enum_open_table_action action_arg, if (action_arg != OT_REOPEN_TABLES && m_has_locks) { my_error(ER_LOCK_DEADLOCK, MYF(0)); - mark_transaction_to_rollback(m_thd, true); + m_thd->mark_transaction_to_rollback(true); return TRUE; } /* |