diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-29 11:33:39 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-29 22:20:34 +0300 |
| commit | 8143ef1b7ca144f828f0a1d22671a76685825166 (patch) | |
| tree | 6c3d26b46e3337cb5d0a5a393f5ed34c76c81387 | |
| parent | bb60a832ede139d24a2470a1b1217d30799d726e (diff) | |
| download | mariadb-git-8143ef1b7ca144f828f0a1d22671a76685825166.tar.gz | |
trx_validate_state_before_free(): Add debug assertions
| -rw-r--r-- | storage/innobase/trx/trx0trx.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index 7fdbd808a60..b84bc6b961a 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -548,6 +548,10 @@ static void trx_validate_state_before_free(trx_t* trx) { + ut_ad(!trx->declared_to_be_inside_innodb); + ut_ad(!trx->n_mysql_tables_in_use); + ut_ad(!trx->mysql_n_tables_locked); + if (trx->declared_to_be_inside_innodb) { ib::error() << "Freeing a trx (" << trx << ", " @@ -558,7 +562,7 @@ trx_validate_state_before_free(trx_t* trx) putc('\n', stderr); /* This is an error but not a fatal error. We must keep - the counters like srv_conc_n_threads accurate. */ + the counters like srv_conc.n_active accurate. */ srv_conc_force_exit_innodb(trx); } |