diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-05 20:30:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-05 20:30:57 +0300 |
| commit | 65d0c57c1a2036c8a8c065d3e3bd4f85d0cc5d57 (patch) | |
| tree | 9165f331634b0725bcf628390fcfd8a3381f7147 /storage/innobase/trx/trx0trx.cc | |
| parent | df97eb1432f91ad13e562111bda393b3650719d0 (diff) | |
| parent | c0eda62aec1de8b74ca51791df5ad142dee2ef08 (diff) | |
| download | mariadb-git-65d0c57c1a2036c8a8c065d3e3bd4f85d0cc5d57.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/trx/trx0trx.cc')
| -rw-r--r-- | storage/innobase/trx/trx0trx.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index 038cf9be825..770bbd961f2 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -568,8 +568,10 @@ void trx_disconnect_prepared(trx_t *trx) ut_ad(trx_state_eq(trx, TRX_STATE_PREPARED)); ut_ad(trx->mysql_thd); trx->read_view.close(); + mutex_enter(&trx_sys.mutex); trx->is_recovered= true; trx->mysql_thd= NULL; + mutex_exit(&trx_sys.mutex); /* todo/fixme: suggest to do it at innodb prepare */ trx->will_lock= false; } |