revision-id: aa6a2c23465173c4b62e9c829b82e3b9cbd96314 (mariadb-10.3.6-318-gaa6a2c23465) parent(s): 994c25b18b1a8a5658c0f3efa8a4edb899ff55e3 author: Jan Lindström committer: Jan Lindström timestamp: 2019-01-17 10:59:55 +0200 message: Disable tests that were already disabled earlier galera_as_slave_gtid_replicate_do_db_cc : Requires MySQL GTID galera.galera_kill_nochanges : MDEV-18280 Galera test failure on galera_split_brain and galera_kill_nochanges galera.galera_split_brain : MDEV-18280 Galera test failure on galera_split_brain and galera_kill_nochanges wsrep_append_foreign_key Fix compiler warning wsrep_append_key ha_innobase::wsrep_append_keys Fix output formating wsrep_kill_victim Remove unnecessary bf_this and unnecessary comparison to bf_other trx_get_trx_by_xid_callback Add comment to #endif modified: mysql-test/suite/galera/disabled.def modified: storage/innobase/handler/ha_innodb.cc modified: storage/innobase/lock/lock0lock.cc modified: storage/innobase/trx/trx0trx.cc --- mysql-test/suite/galera/disabled.def | 3 +++ storage/innobase/handler/ha_innodb.cc | 10 +++++----- storage/innobase/lock/lock0lock.cc | 14 +++++--------- storage/innobase/trx/trx0trx.cc | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 61d4698180f..cb6c1d05e36 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -16,6 +16,7 @@ galera_binlog_rows_query_log_events: MariaDB does not support binlog_rows_query_ galera_migrate : MariaDB does not support START SLAVE USER galera_as_master_gtid : Requires MySQL GTID galera_as_master_gtid_change_master : Requires MySQL GTID +galera_as_slave_gtid_replicate_do_db_cc : Requires MySQL GTID galera_as_slave_preordered : wsrep-preordered feature not merged to MariaDB GAL-419 : MDEV-13549 Galera test failures galera_var_notify_cmd : MDEV-13549 Galera test failures @@ -58,3 +59,5 @@ galera.galera_kill_largechanges : MDEV-18179 Galera test failure on galera.galer galera.galera_concurrent_ctas : MDEV-18180 Galera test failure on galera.galera_concurrent_ctas galera.galera_var_retry_autocommit: MDEV-18181 Galera test failure on galera.galera_var_retry_autocommit galera.galera_many_tables_nopk : MDEV-18182 Galera test failure on galera.galera_many_tables_nopk +galera.galera_kill_nochanges : MDEV-18280 Galera test failure on galera_split_brain and galera_kill_nochanges +galera.galera_split_brain : MDEV-18280 Galera test failure on galera_split_brain and galera_kill_nochanges diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index f18ab5ecdb3..e194c47a518 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -10283,7 +10283,7 @@ wsrep_append_foreign_key( if (rcode != DB_SUCCESS) { WSREP_ERROR( "FK key set failed: " ULINTPF - " (" ULINTPF " " ULINTPF "%s), index: %s %s, %s", + " (" ULINTPF "%s), index: %s %s, %s", rcode, referenced, wsrep_key_type_to_str(key_type), (index) ? index->name() : "void index", (index && index->table) ? index->table->name.m_name : @@ -10364,9 +10364,9 @@ wsrep_append_key( ("thd: %lu trx: %lld", thd_get_thread_id(thd), (long long)trx->id)); #ifdef WSREP_DEBUG_PRINT - fprintf(stderr, "%s conn %lu, trx %llu, keylen %d, key %s.%s\n", + fprintf(stderr, "%s conn %lu, trx " TRX_ID_FMT ", keylen %d, key %s.%s\n", wsrep_key_type_to_str(key_type), - thd_get_thread_id(thd), (long long)trx->id, key_len, + thd_get_thread_id(thd), trx->id, key_len, table_share->table_name.str, key); for (int i=0; i<key_len; i++) { fprintf(stderr, "%hhX, ", key[i]); @@ -10448,9 +10448,9 @@ ha_innobase::wsrep_append_keys( trx_t *trx = thd_to_trx(thd); #ifdef WSREP_DEBUG_PRINT - fprintf(stderr, "%s conn %lu, trx %llu, table %s\nSQL: %s\n", + fprintf(stderr, "%s conn %lu, trx " TRX_ID_FMT ", table %s\nSQL: %s\n", wsrep_key_type_to_str(key_type), - thd_get_thread_id(thd), (long long)trx->id, + thd_get_thread_id(thd), trx->id, table_share->table_name.str, wsrep_thd_query(thd)); #endif diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index c3de4e4f732..f8003157351 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -1095,15 +1095,15 @@ wsrep_kill_victim( return; } - my_bool bf_this = wsrep_thd_is_BF(trx->mysql_thd, FALSE); - if (!bf_this) return; + if (!wsrep_thd_is_BF(trx->mysql_thd, FALSE)) { + return; + } my_bool bf_other = wsrep_thd_is_BF(lock->trx->mysql_thd, TRUE); if ((!bf_other) || - (bf_other && wsrep_thd_order_before( + (wsrep_thd_order_before( trx->mysql_thd, lock->trx->mysql_thd))) { - ut_ad(bf_this); if (lock->trx->lock.que_state == TRX_QUE_LOCK_WAIT) { if (wsrep_debug) { @@ -1113,11 +1113,7 @@ wsrep_kill_victim( is in the queue*/ } else if (lock->trx != trx) { if (wsrep_log_conflicts) { - if (bf_this) { - ib::info() << "*** Priority TRANSACTION:"; - } else { - ib::info() << "*** Victim TRANSACTION:"; - } + ib::info() << "*** Priority TRANSACTION:"; trx_print_latched(stderr, trx, 3000); diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index d222e3f017c..7be760c6221 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -2152,7 +2152,7 @@ static my_bool trx_get_trx_by_xid_callback(rw_trx_hash_element_t *element, transaction needs a valid trx->xid for invoking trx_sys_update_wsrep_checkpoint(). */ if (!wsrep_is_wsrep_xid(trx->xid)) -#endif +#endif /* WITH_WSREP */ /* Invalidate the XID, so that subsequent calls will not find it. */ trx->xid->null(); arg->trx= trx;