diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 18:05:22 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 18:05:22 +0300 |
| commit | 68d9d512e933a1d40670add50f205e5266bc5507 (patch) | |
| tree | 24f483a40449b28b4414360fbdd03646315ac1ec /storage/innobase/trx/trx0trx.cc | |
| parent | 6404645980db51fdc1e5dae2ac94eca57804284b (diff) | |
| parent | 286e52e948eee9e5f908c5944467149df35d25e7 (diff) | |
| download | mariadb-git-68d9d512e933a1d40670add50f205e5266bc5507.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/trx/trx0trx.cc')
| -rw-r--r-- | storage/innobase/trx/trx0trx.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index ca3d858364a..c61eba8f421 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -401,9 +401,8 @@ void trx_free(trx_t*& trx) ut_ad(!trx->mysql_n_tables_locked); ut_ad(!trx->internal); - if (trx->declared_to_be_inside_innodb) { - - ib::error() << "Freeing a trx (" << trx << ", " + if (UNIV_UNLIKELY(trx->declared_to_be_inside_innodb)) { + ib::error() << "Freeing a trx (" << trx_get_id_for_print(trx) << ") which is declared" " to be processing inside InnoDB"; |