diff options
author | Sergei Petrunia <psergey@askmonty.org> | 2017-02-20 13:01:32 +0000 |
---|---|---|
committer | Sergei Petrunia <psergey@askmonty.org> | 2017-02-20 13:01:32 +0000 |
commit | 7d00f0981ee89df32d7bb8cafa6ac720dd2078d4 (patch) | |
tree | 862e58616812d11002f76e3a8f067be76f8b3646 /storage/rocksdb/rdb_sst_info.h | |
parent | 5e47d08eb628a57b5d0f42d276551ace6d21ea12 (diff) | |
parent | 7facbc548db6761d60955982bd40dd83cbd00c85 (diff) | |
download | mariadb-git-7d00f0981ee89df32d7bb8cafa6ac720dd2078d4.tar.gz |
Merge between local changes bb-10.2-mariarocks and the merge from upstream
Diffstat (limited to 'storage/rocksdb/rdb_sst_info.h')
-rw-r--r-- | storage/rocksdb/rdb_sst_info.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/rocksdb/rdb_sst_info.h b/storage/rocksdb/rdb_sst_info.h index 45d44fc848b..d7f05e8dc7c 100644 --- a/storage/rocksdb/rdb_sst_info.h +++ b/storage/rocksdb/rdb_sst_info.h @@ -67,7 +67,7 @@ private: const rocksdb::DBOptions &m_db_options; uint64_t m_curr_size; uint64_t m_max_size; - uint m_sst_count; + uint32_t m_sst_count; std::string m_error_msg; std::string m_prefix; static std::string m_suffix; |