diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-22 08:43:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-22 08:43:03 +0300 |
| commit | 54c460ace606157f2a23706ec98e9de70aba767e (patch) | |
| tree | 20a8018cd8972c4f6e5031e140557e4895680608 /storage/perfschema/pfs_engine_table.cc | |
| parent | b728c3dbd9273299b676b5d0d793464e7b20f08d (diff) | |
| parent | df33b719ca9271cd1a3c2930db399b9685ffd3ca (diff) | |
| download | mariadb-git-54c460ace606157f2a23706ec98e9de70aba767e.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'storage/perfschema/pfs_engine_table.cc')
| -rw-r--r-- | storage/perfschema/pfs_engine_table.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/storage/perfschema/pfs_engine_table.cc b/storage/perfschema/pfs_engine_table.cc index e54681188e6..d2a42bd7f98 100644 --- a/storage/perfschema/pfs_engine_table.cc +++ b/storage/perfschema/pfs_engine_table.cc @@ -154,7 +154,6 @@ bool PFS_table_context::initialize(void) m_map= context->m_map; DBUG_ASSERT(m_map_size == context->m_map_size); m_map_size= context->m_map_size; - m_word_size= context->m_word_size; } } else @@ -168,7 +167,6 @@ bool PFS_table_context::initialize(void) /* Initialize a new context, store in TLS. */ m_last_version= m_current_version; m_map= NULL; - m_word_size= sizeof(ulong) * 8; /* Allocate a bitmap to record which threads are materialized. */ if (m_map_size > 0) @@ -190,7 +188,7 @@ bool PFS_table_context::initialize(void) /* Constructor for global or single thread tables, map size = 0. */ PFS_table_context::PFS_table_context(ulonglong current_version, bool restore, thread_local_key_t key) : m_thr_key(key), m_current_version(current_version), m_last_version(0), - m_map(NULL), m_map_size(0), m_word_size(sizeof(ulong)), + m_map(NULL), m_map_size(0), m_restore(restore), m_initialized(false), m_last_item(0) { initialize(); @@ -199,7 +197,7 @@ PFS_table_context::PFS_table_context(ulonglong current_version, bool restore, th /* Constructor for by-thread or aggregate tables, map size = max thread/user/host/account. */ PFS_table_context::PFS_table_context(ulonglong current_version, ulong map_size, bool restore, thread_local_key_t key) : m_thr_key(key), m_current_version(current_version), m_last_version(0), - m_map(NULL), m_map_size(map_size), m_word_size(sizeof(ulong)), + m_map(NULL), m_map_size(map_size), m_restore(restore), m_initialized(false), m_last_item(0) { initialize(); @@ -220,7 +218,7 @@ void PFS_table_context::set_item(ulong n) return; ulong word= n / m_word_size; ulong bit= n % m_word_size; - m_map[word] |= (1 << bit); + m_map[word] |= (1UL << bit); m_last_item= n; } |