diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-02-27 16:00:43 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-10 19:24:23 +0100 |
| commit | cbede21d0d27b069a7d1077524e187cc7556ffee (patch) | |
| tree | 21997b21f35e00e90cf02a8b9fc9b0f995b38b5f /storage/federatedx | |
| parent | 211421d5cc999226e2badca28497f3caed06aee6 (diff) | |
| download | mariadb-git-cbede21d0d27b069a7d1077524e187cc7556ffee.tar.gz | |
cleanup: pass trxid by value
Diffstat (limited to 'storage/federatedx')
| -rw-r--r-- | storage/federatedx/ha_federatedx.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index 207964e9e9b..b76391dae4e 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, NULL); + trans_register_ha(thd, FALSE, ht, 0); } 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, NULL); + trans_register_ha(thd, FALSE, ht, 0); } else { txn->txn_begin(); - trans_register_ha(thd, TRUE, ht, NULL); + trans_register_ha(thd, TRUE, ht, 0); } } } @@ -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, NULL); + trans_register_ha(thd, TRUE, hton, 0); txn->sp_acquire((ulong *) sv); |