diff options
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/federatedx/ha_federatedx.cc | 8 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 8 | ||||
| -rw-r--r-- | storage/rocksdb/ha_rocksdb.cc | 4 | ||||
| -rw-r--r-- | storage/spider/spd_trx.cc | 8 |
4 files changed, 12 insertions, 16 deletions
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index b042fa720dc..81f6ee99f82 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -3492,7 +3492,7 @@ int ha_federatedx::start_stmt(MYSQL_THD thd, thr_lock_type lock_type) if (!txn->in_transaction()) { txn->stmt_begin(); - trans_register_ha(thd, FALSE, ht); + trans_register_ha(thd, FALSE, ht, NULL); } DBUG_RETURN(0); } @@ -3515,12 +3515,12 @@ int ha_federatedx::external_lock(MYSQL_THD thd, int lock_type) if (!thd_test_options(thd, (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) { txn->stmt_begin(); - trans_register_ha(thd, FALSE, ht); + trans_register_ha(thd, FALSE, ht, NULL); } else { txn->txn_begin(); - trans_register_ha(thd, TRUE, ht); + trans_register_ha(thd, TRUE, ht, NULL); } } } @@ -3538,7 +3538,7 @@ int ha_federatedx::savepoint_set(handlerton *hton, MYSQL_THD thd, void *sv) if (txn && txn->has_connections()) { if (txn->txn_begin()) - trans_register_ha(thd, TRUE, hton); + trans_register_ha(thd, TRUE, hton, NULL); txn->sp_acquire((ulong *) sv); diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index c2094b23d3a..4072e88efdd 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -2786,19 +2786,15 @@ innobase_register_trx( THD* thd, /* in: MySQL thd (connection) object */ trx_t* trx) /* in: transaction to register */ { - /* JAN: TODO: MySQL 5.7 PSI - const ulonglong trx_id = static_cast<const ulonglong>( + const ulonglong trx_id = static_cast<ulonglong>( trx_get_id_for_print(trx)); trans_register_ha(thd, FALSE, hton, &trx_id); - */ - trans_register_ha(thd, FALSE, hton); if (!trx_is_registered_for_2pc(trx) && thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) { - //trans_register_ha(thd, TRUE, hton, &trx_id); - trans_register_ha(thd, TRUE, hton); + trans_register_ha(thd, TRUE, hton, &trx_id); } trx_register_for_2pc(trx); diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 71ec5eb4634..711aaaaa173 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -4788,10 +4788,10 @@ static inline void rocksdb_register_tx(handlerton *const hton, THD *const thd, Rdb_transaction *const tx) { DBUG_ASSERT(tx != nullptr); - trans_register_ha(thd, FALSE, rocksdb_hton); + trans_register_ha(thd, FALSE, rocksdb_hton, NULL); if (my_core::thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) { tx->start_stmt(); - trans_register_ha(thd, TRUE, rocksdb_hton); + trans_register_ha(thd, TRUE, rocksdb_hton, NULL); } } diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc index d3ff8424f9d..1273bf64fc8 100644 --- a/storage/spider/spd_trx.cc +++ b/storage/spider/spd_trx.cc @@ -1990,9 +1990,9 @@ int spider_internal_start_trx( trx->trx_consistent_snapshot ? "TRUE" : "FALSE")); if (!trx->trx_consistent_snapshot) { - trans_register_ha(thd, FALSE, spider_hton_ptr); + trans_register_ha(thd, FALSE, spider_hton_ptr, NULL); if (thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) - trans_register_ha(thd, TRUE, spider_hton_ptr); + trans_register_ha(thd, TRUE, spider_hton_ptr, NULL); } trx->trx_start = TRUE; trx->trx_xa_prepared = FALSE; @@ -3335,8 +3335,8 @@ int spider_start_consistent_snapshot( trx->trx_consistent_snapshot = TRUE; trx->use_consistent_snapshot = TRUE; trx->internal_xa_snapshot = spider_param_internal_xa_snapshot(trx->thd); - trans_register_ha(trx->thd, FALSE, spider_hton_ptr); - trans_register_ha(trx->thd, TRUE, spider_hton_ptr); + trans_register_ha(trx->thd, FALSE, spider_hton_ptr, NULL); + trans_register_ha(trx->thd, TRUE, spider_hton_ptr, NULL); if (spider_param_use_all_conns_snapshot(trx->thd)) { trx->internal_xa = FALSE; |