revision-id: 09cb493b301b0fb953b3ff85bffab19508c86714 (mariadb-10.3.6-274-g09cb493b301) parent(s): 49e41bfb50769696ff594cd439ebe3599abac984 author: Jan Lindström committer: Jan Lindström timestamp: 2018-12-28 16:59:24 +0200 message: Revert unnecessary changes - part I. --- storage/innobase/handler/ha_innodb.cc | 6 ++++++ storage/innobase/include/trx0trx.h | 2 ++ storage/innobase/lock/lock0wait.cc | 1 + storage/innobase/trx/trx0roll.cc | 6 +----- storage/innobase/trx/trx0trx.cc | 5 +---- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 5c887bca109..2924ed8a45c 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -6529,6 +6529,7 @@ ha_innobase::close() UNIV_INTERN ulint wsrep_innobase_mysql_sort( +/*======================*/ /* out: str contains sort string */ int mysql_type, /* in: MySQL type */ uint charset_number, /* in: number of the charset */ @@ -6952,6 +6953,7 @@ Stores a key value for a row to a buffer. UNIV_INTERN uint wsrep_store_key_val_for_row( +/*=========================*/ THD* thd, TABLE* table, uint keynr, /*!< in: key number */ @@ -8675,6 +8677,7 @@ calc_row_difference( static int wsrep_calc_row_hash( +/*================*/ byte* digest, /*!< in/out: md5 sum */ const uchar* row, /*!< in: row in MySQL format */ TABLE* table, /*!< in: table in MySQL data @@ -10177,6 +10180,7 @@ wsrep_key_type_to_str(Wsrep_service_key_type type) extern dberr_t wsrep_append_foreign_key( +/*===========================*/ trx_t* trx, /*!< in: trx */ dict_foreign_t* foreign, /*!< in: foreign key constraint */ const rec_t* rec, /*!<in: clustered index record */ @@ -10348,6 +10352,7 @@ wsrep_append_foreign_key( static int wsrep_append_key( +/*=============*/ THD *thd, trx_t *trx, TABLE_SHARE *table_share, @@ -10426,6 +10431,7 @@ referenced_by_foreign_key2( int ha_innobase::wsrep_append_keys( +/*===========================*/ THD *thd, Wsrep_service_key_type key_type, /*!< in: access type of this row operation: diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h index 5dded9ee7af..119a0c1f214 100644 --- a/storage/innobase/include/trx0trx.h +++ b/storage/innobase/include/trx0trx.h @@ -579,9 +579,11 @@ struct trx_lock_t { lock_sys.mutex. Otherwise, this may only be modified by the thread that is serving the running transaction. */ +#ifdef WITH_WSREP bool was_chosen_as_wsrep_victim; /*!< high priority wsrep thread has marked this trx to abort */ +#endif /* WITH_WSREP */ /** Pre-allocated record locks */ struct { diff --git a/storage/innobase/lock/lock0wait.cc b/storage/innobase/lock/lock0wait.cc index 6d482984f3f..721f6151c36 100644 --- a/storage/innobase/lock/lock0wait.cc +++ b/storage/innobase/lock/lock0wait.cc @@ -36,6 +36,7 @@ Created 25/5/2010 Sunny Bains #include "row0mysql.h" #include "srv0start.h" #include "lock0priv.h" + /*********************************************************************//** Print the contents of the lock_sys_t::waiting_threads array. */ static diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc index 249112a22e3..a33eb1fa0f9 100644 --- a/storage/innobase/trx/trx0roll.cc +++ b/storage/innobase/trx/trx0roll.cc @@ -451,12 +451,8 @@ trx_rollback_to_savepoint_for_mysql_low( trx_mark_sql_stat_end(trx); trx->op_info = ""; - + trx->lock.was_chosen_as_deadlock_victim = FALSE; #ifdef WITH_WSREP - if (wsrep_on(trx->mysql_thd) && - trx->lock.was_chosen_as_deadlock_victim) { - trx->lock.was_chosen_as_deadlock_victim = FALSE; - } trx->lock.was_chosen_as_wsrep_victim = FALSE; #endif return(err); diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index bf6edcfdca2..ff62101e3de 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -1443,11 +1443,8 @@ trx_commit_in_memory( trx_mutex_enter(trx); trx->dict_operation = TRX_DICT_OP_NONE; - + trx->lock.was_chosen_as_deadlock_victim = FALSE; #ifdef WITH_WSREP - if (trx->mysql_thd && wsrep_on(trx->mysql_thd)) { - trx->lock.was_chosen_as_deadlock_victim = FALSE; - } trx->lock.was_chosen_as_wsrep_victim = FALSE; #endif