database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-12 20:49:12 +03:00
Code Activity

Code cleanup.

Browse Source
This commit is contained in:
Jan Lindström
2015-10-21 09:20:54 +03:00
parent f3e362464b
commit 17b0b45b1d
2 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
storage/innobase/handler/ha_innodb.cc
View File

@@ -4,7 +4,7 @@ Copyright (c) 2000, 2015, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, 2009 Google Inc. Copyright (c) 2008, 2009 Google Inc.
Copyright (c) 2009, Percona Inc. Copyright (c) 2009, Percona Inc.
Copyright (c) 2012, Facebook Inc. Copyright (c) 2012, Facebook Inc.
Copyright (c) 2013, 2015 MariaDB Corporation. All Rights Reserved. Copyright (c) 2013, 2015, MariaDB Corporation. All Rights Reserved.
Portions of this file contain modifications contributed and copyrighted by Portions of this file contain modifications contributed and copyrighted by
Google, Inc. Those modifications are gratefully acknowledged and are described Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -17311,11 +17311,13 @@ wsrep_abort_slave_trx(wsrep_seqno_t bf_seqno, wsrep_seqno_t victim_seqno)
} }
/*******************************************************************//** /*******************************************************************//**
This function is used to kill one transaction in BF. */ This function is used to kill one transaction in BF. */
UNIV_INTERN
int int
wsrep_innobase_kill_one_trx(void * const bf_thd_ptr, wsrep_innobase_kill_one_trx(
void * const bf_thd_ptr,
const trx_t * const bf_trx, const trx_t * const bf_trx,
trx_t *victim_trx, ibool signal) trx_t *victim_trx,
ibool signal)
{ {
ut_ad(lock_mutex_own()); ut_ad(lock_mutex_own());
ut_ad(trx_mutex_own(victim_trx)); ut_ad(trx_mutex_own(victim_trx));
@@ -17527,20 +17529,26 @@ wsrep_innobase_kill_one_trx(void * const bf_thd_ptr,
DBUG_RETURN(0); DBUG_RETURN(0);
} }
static int
wsrep_abort_transaction(handlerton* hton, THD *bf_thd, THD *victim_thd, static
int
wsrep_abort_transaction(
handlerton* hton,
THD *bf_thd,
THD *victim_thd,
my_bool signal) my_bool signal)
{ {
DBUG_ENTER("wsrep_innobase_abort_thd"); DBUG_ENTER("wsrep_innobase_abort_thd");
trx_t* victim_trx = thd_to_trx(victim_thd); trx_t* victim_trx = thd_to_trx(victim_thd);
trx_t* bf_trx = (bf_thd) ? thd_to_trx(bf_thd) : NULL; trx_t* bf_trx = (bf_thd) ? thd_to_trx(bf_thd) : NULL;
WSREP_DEBUG("abort transaction: BF: %s victim: %s", WSREP_DEBUG("abort transaction: BF: %s victim: %s",
wsrep_thd_query(bf_thd), wsrep_thd_query(bf_thd),
wsrep_thd_query(victim_thd)); wsrep_thd_query(victim_thd));
if (victim_trx) { if (victim_trx) {
victim_trx->current_lock_mutex_owner = victim_thd;
lock_mutex_enter(); lock_mutex_enter();
victim_trx->current_lock_mutex_owner = victim_thd;
trx_mutex_enter(victim_trx); trx_mutex_enter(victim_trx);
int rcode = wsrep_innobase_kill_one_trx(bf_thd, bf_trx, int rcode = wsrep_innobase_kill_one_trx(bf_thd, bf_trx,
victim_trx, signal); victim_trx, signal);

12
storage/xtradb/handler/ha_innodb.cc
View File

@@ -4,7 +4,7 @@ Copyright (c) 2000, 2015, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, 2009 Google Inc. Copyright (c) 2008, 2009 Google Inc.
Copyright (c) 2009, Percona Inc. Copyright (c) 2009, Percona Inc.
Copyright (c) 2012, Facebook Inc. Copyright (c) 2012, Facebook Inc.
Copyright (c) 2013, 2015 MariaDB Corporation. All Rights Reserved. Copyright (c) 2013, 2015, MariaDB Corporation. All Rights Reserved.
Portions of this file contain modifications contributed and copyrighted by Portions of this file contain modifications contributed and copyrighted by
Google, Inc. Those modifications are gratefully acknowledged and are described Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -18321,11 +18321,13 @@ wsrep_abort_slave_trx(wsrep_seqno_t bf_seqno, wsrep_seqno_t victim_seqno)
} }
/*******************************************************************//** /*******************************************************************//**
This function is used to kill one transaction in BF. */ This function is used to kill one transaction in BF. */
UNIV_INTERN
int int
wsrep_innobase_kill_one_trx(void * const bf_thd_ptr, wsrep_innobase_kill_one_trx(
void * const bf_thd_ptr,
const trx_t * const bf_trx, const trx_t * const bf_trx,
trx_t *victim_trx, ibool signal) trx_t *victim_trx,
ibool signal)
{ {
ut_ad(lock_mutex_own()); ut_ad(lock_mutex_own());
ut_ad(trx_mutex_own(victim_trx)); ut_ad(trx_mutex_own(victim_trx));
@@ -18549,8 +18551,8 @@ wsrep_abort_transaction(handlerton* hton, THD *bf_thd, THD *victim_thd,
wsrep_thd_query(victim_thd)); wsrep_thd_query(victim_thd));
if (victim_trx) { if (victim_trx) {
victim_trx->current_lock_mutex_owner = victim_thd;
lock_mutex_enter(); lock_mutex_enter();
victim_trx->current_lock_mutex_owner = victim_thd;
trx_mutex_enter(victim_trx); trx_mutex_enter(victim_trx);
int rcode = wsrep_innobase_kill_one_trx(bf_thd, bf_trx, int rcode = wsrep_innobase_kill_one_trx(bf_thd, bf_trx,
victim_trx, signal); victim_trx, signal);