- up to 5.5.17

[packages/mysql.git] / innodb_buffer_pool_pages_i_s.patch

diff --git a/innodb_buffer_pool_pages_i_s.patch b/innodb_buffer_pool_pages_i_s.patch
index 151cb5a1a2bbaea6d742207c62cd0697b6e0adb2..0ff3d4deba337e6bf275bc57d7b3882ca1675c62 100644 (file)
--- a/innodb_buffer_pool_pages_i_s.patch
+++ b/innodb_buffer_pool_pages_i_s.patch
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
-@@ -4157,6 +4157,36 @@
+@@ -4224,6 +4224,36 @@
        mutex_exit(block_mutex);
  }
  
@@ -46,7 +46,7 @@
  @return       TRUE */
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -12165,6 +12165,9 @@
+@@ -12287,6 +12287,9 @@
  i_s_innodb_sys_stats,
  i_s_innodb_table_stats,
  i_s_innodb_index_stats,
@@ -66,7 +66,7 @@
  }
  
  #define OK(expr)              \
-@@ -4344,3 +4345,701 @@
+@@ -4372,3 +4373,701 @@
        STRUCT_FLD(system_vars, NULL),
        STRUCT_FLD(__reserved1, NULL)
  };
@@ -781,7 +781,7 @@
  #endif /* i_s_h */
 --- a/storage/innobase/include/buf0buf.h
 +++ b/storage/innobase/include/buf0buf.h
-@@ -1183,6 +1183,14 @@
+@@ -1174,6 +1174,14 @@
  /*===========*/
        const buf_pool_t*       buf_pool)       /*!< in: buffer pool */
        __attribute__((nonnull, const));