diff options
author | Sergei Golubchik <sergii@pisem.net> | 2015-02-18 17:59:21 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2015-02-18 17:59:21 +0100 |
commit | 6b05688f6d8920171fe14453082101316fa2dd8e (patch) | |
tree | 2d46f8747029613c9540a4afe65efe854ef0915d /storage/innobase/trx/trx0roll.cc | |
parent | 44cf4d675199bac0a9c23d38a68303e921c82cbe (diff) | |
parent | 1645930d0bd02f79df3ebff412b90acdc15bd9a0 (diff) | |
download | mariadb-git-6b05688f6d8920171fe14453082101316fa2dd8e.tar.gz |
innodb 5.6.23
Diffstat (limited to 'storage/innobase/trx/trx0roll.cc')
-rw-r--r-- | storage/innobase/trx/trx0roll.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc index a64367c4ba7..bc11f1d76bd 100644 --- a/storage/innobase/trx/trx0roll.cc +++ b/storage/innobase/trx/trx0roll.cc @@ -50,6 +50,9 @@ Created 3/26/1996 Heikki Tuuri rollback */ #define TRX_ROLL_TRUNC_THRESHOLD 1 +/** true if trx_rollback_or_clean_all_recovered() thread is active */ +bool trx_rollback_or_clean_is_active; + /** In crash recovery, the current trx to be rolled back; NULL otherwise */ static const trx_t* trx_roll_crash_recv_trx = NULL; @@ -805,6 +808,8 @@ DECLARE_THREAD(trx_rollback_or_clean_all_recovered)( trx_rollback_or_clean_recovered(TRUE); + trx_rollback_or_clean_is_active = false; + /* We count the number of threads in os_thread_exit(). A created thread should always use that to exit and not use return() to exit. */ |