diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-26 08:54:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-26 09:19:52 +0300 |
| commit | 93b6552182740d1a66cf41c30811e7275d31b07f (patch) | |
| tree | 96341a5a841bfd6b53981b9b96b1cd5ef6e7f3d5 /storage/innobase/include/buf0flu.h | |
| parent | 294a426088bd7167f42388e7e76ff8d42df7d6be (diff) | |
| parent | 0f90728bc0f8bc946a61500801b23f8a316e73d5 (diff) | |
| download | mariadb-git-93b6552182740d1a66cf41c30811e7275d31b07f.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/include/buf0flu.h')
| -rw-r--r-- | storage/innobase/include/buf0flu.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/storage/innobase/include/buf0flu.h b/storage/innobase/include/buf0flu.h index ace2e2f6ef1..741cb1dbca3 100644 --- a/storage/innobase/include/buf0flu.h +++ b/storage/innobase/include/buf0flu.h @@ -371,9 +371,8 @@ public: m_interrupted = true; } - /** Check whether trx is interrupted - @return true if trx is interrupted */ - bool check_interrupted(); + /** Check whether the operation has been interrupted */ + void check_interrupted(); /** Flush dirty pages. */ void flush(); @@ -395,7 +394,7 @@ private: fil_space_t* m_space; /** Trx instance */ - trx_t* const m_trx; + const trx_t* const m_trx; /** Performance schema accounting object, used by ALTER TABLE. If not NULL, then stage->begin_phase_flush() will be called initially, |