1 files changed, 5 insertions, 4 deletions
diff --git a/storage/perfschema/pfs_buffer_container.h b/storage/perfschema/pfs_buffer_container.h
index 911e030209a..141cbdf2999 100644
--- a/storage/perfschema/pfs_buffer_container.h
+++ b/storage/perfschema/pfs_buffer_container.h
@@ -88,7 +88,7 @@ public:
       return NULL;
 
     monotonic= PFS_atomic::add_u32(& m_monotonic.m_u32, 1);
-    monotonic_max= monotonic + m_max;
+    monotonic_max= monotonic + static_cast<uint>(m_max);
 
     while (monotonic < monotonic_max)
     {
@@ -428,6 +428,7 @@ public:
   {
     m_allocator= allocator;
     m_initialized= false;
+    m_lost= 0;
   }
 
   int init(long max_size)
@@ -979,7 +980,7 @@ private:
 
       if (page == NULL)
       {
-        index= m_max;
+        index= static_cast<uint>(m_max);
         return NULL;
       }
 
@@ -991,7 +992,7 @@ private:
       {
         if (pfs->m_lock.is_populated())
         {
-          uint found= index_1 * PFS_PAGE_SIZE + (pfs - pfs_first);
+          uint found= index_1 * PFS_PAGE_SIZE + static_cast<uint>(pfs - pfs_first);
           *found_index= found;
           index= found + 1;
           return pfs;
@@ -1003,7 +1004,7 @@ private:
       index_2= 0;
     }
 
-    index= m_max;
+    index= static_cast<uint>(m_max);
     return NULL;
   }