diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-04 16:26:14 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-06 18:52:28 +0200 |
commit | 77fb7ccba41e9a901053ffc4fdc461968f6f616f (patch) | |
tree | 6da6bf27412bc667ecb335df042877fe4f942978 /storage/innobase/trx/trx0purge.cc | |
parent | 7dc6066dead562e70a68e6727fe4ee65d0bd0c72 (diff) | |
download | mariadb-git-77fb7ccba41e9a901053ffc4fdc461968f6f616f.tar.gz |
Follow-up fix to MDEV-13201 Assertion `srv_undo_sources || ...` failed on shutdown during DDL operation
Introduce the debug flag trx_t::persistent_stats to suppress the
assertion for the updates of persistent statistics during fast
shutdown.
dict_stats_exec_sql(): Do execute the statement even though shutdown
has been initiated.
Diffstat (limited to 'storage/innobase/trx/trx0purge.cc')
-rw-r--r-- | storage/innobase/trx/trx0purge.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc index c04fd5353a3..61c36637a4e 100644 --- a/storage/innobase/trx/trx0purge.cc +++ b/storage/innobase/trx/trx0purge.cc @@ -301,7 +301,8 @@ trx_purge_add_update_undo_to_history( && purge_sys->state == PURGE_STATE_INIT) || (srv_force_recovery >= SRV_FORCE_NO_BACKGROUND && purge_sys->state == PURGE_STATE_DISABLED) - || ((trx->undo_no == 0 || trx->in_mysql_trx_list) + || ((trx->undo_no == 0 || trx->in_mysql_trx_list + || trx->persistent_stats) && srv_fast_shutdown)); /* Add the log as the first in the history list */ |