diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-04 13:50:52 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-04 13:50:52 -0400 |
| commit | d2562004c5ac118b399475195b08f17fe673e481 (patch) | |
| tree | 51e261ceee484919e6b5a72eaf1f8535e83ab90c /sql/sql_class.h | |
| parent | 42f99d00eee0023184c6d985fa6f4e7a9717c3d8 (diff) | |
| parent | 4c87f727734955f9e4a0ffde25aae4d43ec0b2a5 (diff) | |
| download | mariadb-git-d2562004c5ac118b399475195b08f17fe673e481.tar.gz | |
Merge tag 'mariadb-5.5.43' into 5.5-galera
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 3418e16f275..1ecb6719ad4 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1,6 +1,6 @@ /* - Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2009, 2013, Monty Program Ab + Copyright (c) 2000, 2015, Oracle and/or its affiliates. + Copyright (c) 2009, 2014, 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 @@ -719,8 +719,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); - #ifdef MYSQL_SERVER void free_tmp_table(THD *thd, TABLE *entry); @@ -2679,6 +2677,8 @@ public: if (stmt_da->is_error()) stmt_da->reset_diagnostics_area(); is_slave_error= 0; + if (killed == KILL_BAD_DATA) + killed= NOT_KILLED; // KILL_BAD_DATA can be reset w/o a mutex DBUG_VOID_RETURN; } #ifndef EMBEDDED_LIBRARY @@ -3178,6 +3178,7 @@ public: mysql_mutex_unlock(&LOCK_status); } + void mark_transaction_to_rollback(bool all); private: /** The current internal error handler for this thread, or NULL. */ @@ -4220,8 +4221,6 @@ public: */ #define CF_SKIP_QUESTIONS (1U << 1) -void mark_transaction_to_rollback(THD *thd, bool all); - /* Inline functions */ inline bool add_item_to_list(THD *thd, Item *item) |