database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Bug#20094067: BACKPORT BUG#19683834 TO 5.5 AND 5.6

Browse Source 
Backporting the patch and the test case fixed as part
of BUG#16041903 and BUG#19683834 respectively.
This commit is contained in:
Nisha Gopalakrishnan
2015-01-27 13:13:55 +05:30
parent 7a408dbdf4
commit aa1de73728
7 changed files with 335 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.h
View File

@ -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 */