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

bzr merge -r3895..3903 lp:codership-mysql/5.5

Browse Source 
This is just before 5.5.34 merge in wsrep-5.5 branch
This commit is contained in:
Seppo Jaakola
2013-11-26 22:09:14 +02:00
parent 4a11e84414
commit 6422d276fa
16 changed files with 315 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_class.h
View File

@ -1038,9 +1038,6 @@ struct st_savepoint {
/** State of metadata locks before this savepoint was set. */
MDL_savepoint mdl_savepoint;
};
#ifdef WITH_WSREP
void wsrep_cleanup_transaction(THD *thd); // THD.transactions.cleanup calls it
#endif
enum xa_states {XA_NOTR=0, XA_ACTIVE, XA_IDLE, XA_PREPARED, XA_ROLLBACK_ONLY};
extern const char *xa_state_names[];
@ -1984,11 +1981,7 @@ public:
*/
CHANGED_TABLE_LIST* changed_tables;
MEM_ROOT mem_root; // Transaction-life memory allocation pool
#ifdef WITH_WSREP
void cleanup(THD *thd)
#else
void cleanup()
#endif
{
DBUG_ENTER("thd::cleanup");
changed_tables= 0;
@ -2002,11 +1995,6 @@ public:
if (!xid_state.rm_error)
xid_state.xid.null();
free_root(&mem_root,MYF(MY_KEEP_PREALLOC));
#ifdef WITH_WSREP
// Todo: convert into a plugin method
// wsrep's post-commit. LOCAL_COMMIT designates wsrep's commit was ok
if (WSREP(thd)) wsrep_cleanup_transaction(thd);
#endif /* WITH_WSREP */
DBUG_VOID_RETURN;
}
my_bool is_active()
@ -2560,7 +2548,6 @@ public:
Relay_log_info* wsrep_rli;
bool wsrep_converted_lock_session;
wsrep_ws_handle_t wsrep_ws_handle;
bool wsrep_seqno_changed;
#ifdef WSREP_PROC_INFO
char wsrep_info[128]; /* string for dynamic proc info */
#endif /* WSREP_PROC_INFO */