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_class.h | |
| 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_class.h')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 58328713e77..22b4eabac13 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -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 @@ -595,8 +595,6 @@ typedef struct system_status_var #define last_system_status_var questions -void mark_transaction_to_rollback(THD *thd, bool all); - #ifdef MYSQL_SERVER void free_tmp_table(THD *thd, TABLE *entry); @@ -2864,6 +2862,7 @@ public: LEX_STRING get_invoker_user() { return invoker_user; } LEX_STRING get_invoker_host() { return invoker_host; } bool has_invoker() { return invoker_user.length > 0; } + void mark_transaction_to_rollback(bool all); private: /** The current internal error handler for this thread, or NULL. */ @@ -3685,7 +3684,6 @@ void add_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var); void add_diff_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var, STATUS_VAR *dec_var); -void mark_transaction_to_rollback(THD *thd, bool all); /* Inline functions */ |