- rel. 2

[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..9465995f3ec83c2f4f4ee67f0140b8d34b6959a7 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 @@
+@@ -4163,6 +4163,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 @@
+@@ -12338,6 +12338,9 @@
  i_s_innodb_sys_stats,
  i_s_innodb_table_stats,
  i_s_innodb_index_stats,
@@ -66,9 +66,9 @@
  }
  
  #define OK(expr)              \
-@@ -4344,3 +4345,701 @@
-       STRUCT_FLD(system_vars, NULL),
-       STRUCT_FLD(__reserved1, NULL)
+@@ -4411,3 +4412,713 @@
+       STRUCT_FLD(__reserved1, NULL),
+       STRUCT_FLD(flags, 0UL)
  };
 +
 +/***********************************************************************
@@ -453,7 +453,7 @@
 +                              table->field[2]->store(block->page.offset);
 +                              table->field[3]->store(page_get_n_recs(frame));
 +                              table->field[4]->store(page_get_data_size(frame));
-+                              table->field[5]->store(block->is_hashed);
++                              table->field[5]->store(block->index != NULL);
 +                              table->field[6]->store(block->page.access_time);
 +                              table->field[7]->store(block->page.newest_modification != 0);
 +                              table->field[8]->store(block->page.oldest_modification != 0);
@@ -667,7 +667,11 @@
 +
 +      /* reserved for dependency checking */
 +      /* void* */
-+      STRUCT_FLD(__reserved1, NULL)
++      STRUCT_FLD(__reserved1, NULL),
++
++      /* flags for plugin */
++      /* unsigned long */
++      STRUCT_FLD(flags, 0UL)
 +};
 +
 +UNIV_INTERN struct st_mysql_plugin    i_s_innodb_buffer_pool_pages_index =
@@ -716,7 +720,11 @@
 +
 +      /* reserved for dependency checking */
 +      /* void* */
-+      STRUCT_FLD(__reserved1, NULL)
++      STRUCT_FLD(__reserved1, NULL),
++
++      /* flags for plugin */
++      /* unsigned long */
++      STRUCT_FLD(flags, 0UL)
 +};
 +
 +UNIV_INTERN struct st_mysql_plugin    i_s_innodb_buffer_pool_pages_blob =
@@ -765,7 +773,11 @@
 +
 +      /* reserved for dependency checking */
 +      /* void* */
-+      STRUCT_FLD(__reserved1, NULL)
++      STRUCT_FLD(__reserved1, NULL),
++
++      /* flags for plugin */
++      /* unsigned long */
++      STRUCT_FLD(flags, 0UL)
 +};
 +
 --- a/storage/innobase/handler/i_s.h
@@ -781,7 +793,7 @@
  #endif /* i_s_h */
 --- a/storage/innobase/include/buf0buf.h
 +++ b/storage/innobase/include/buf0buf.h
-@@ -1183,6 +1183,14 @@
+@@ -1181,6 +1181,14 @@
  /*===========*/
        const buf_pool_t*       buf_pool)       /*!< in: buffer pool */
        __attribute__((nonnull, const));