diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-02-07 13:15:33 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-02-07 13:15:33 +0200 |
| commit | 2b260f2dddee8eb5a1296b0055caa638bf1bd0c5 (patch) | |
| tree | 858bcb5680c808f41c7f3556f23b29d13303a0b9 | |
| parent | 9a999469f7755f4e91e28c0854b62fe0b2a287ca (diff) | |
| download | mariadb-git-2b260f2dddee8eb5a1296b0055caa638bf1bd0c5.tar.gz | |
Fixup the parent commit
mtr_t::get_log_mode(): Use equivalent static_assert().
mtr_t::m_n_log_recs: Do not exceed the number of bits in uint16_t.
| -rw-r--r-- | storage/innobase/include/mtr0mtr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/mtr0mtr.h b/storage/innobase/include/mtr0mtr.h index cab919a48ca..e721be9903e 100644 --- a/storage/innobase/include/mtr0mtr.h +++ b/storage/innobase/include/mtr0mtr.h @@ -164,7 +164,7 @@ struct mtr_t { /** @return the logging mode */ mtr_log_t get_log_mode() const { - ut_ad(m_log_mode >= MTR_LOG_ALL); + static_assert(MTR_LOG_ALL == 0, "efficiency"); ut_ad(m_log_mode <= MTR_LOG_SHORT_INSERTS); return static_cast<mtr_log_t>(m_log_mode); } @@ -512,7 +512,7 @@ private: uint16_t m_inside_ibuf:1; /** number of m_log records */ - uint16_t m_n_log_recs:13; + uint16_t m_n_log_recs:11; #ifdef UNIV_DEBUG /** Persistent user tablespace associated with the mini-transaction, or 0 (TRX_SYS_SPACE) if none yet */ |