]> git.pld-linux.org Git - packages/mysql.git/blobdiff - innodb_buffer_pool_pages_i_s.patch
projects / packages / mysql.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- 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 e3fa085a68c8f078fd55e74cb3faff1567a74afd..9465995f3ec83c2f4f4ee67f0140b8d34b6959a7 100644 (file)
--- a/innodb_buffer_pool_pages_i_s.patch
+++ b/innodb_buffer_pool_pages_i_s.patch
@@ -5,10 +5,9 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
---- a/storage/innobase/buf/buf0buf.c   2010-12-04 20:20:44.595483291 +0900
-+++ b/storage/innobase/buf/buf0buf.c   2010-12-06 19:28:04.055227506 +0900
-@@ -4516,6 +4516,36 @@
+--- a/storage/innobase/buf/buf0buf.c
++++ b/storage/innobase/buf/buf0buf.c
+@@ -4163,6 +4163,36 @@
        mutex_exit(block_mutex);
  }
  
@@ -45,10 +44,9 @@ diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
  /*********************************************************************//**
  Asserts that all file pages in the buffer are in a replaceable state.
  @return       TRUE */
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc    2010-12-04 20:20:44.614551139 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc    2010-12-06 19:23:47.622195800 +0900
-@@ -12060,6 +12060,9 @@
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
+@@ -12338,6 +12338,9 @@
  i_s_innodb_sys_stats,
  i_s_innodb_table_stats,
  i_s_innodb_index_stats,
@@ -58,9 +56,8 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
  i_s_innodb_admin_command
  mysql_declare_plugin_end;
  
-diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
---- a/storage/innobase/handler/i_s.cc  2010-12-04 19:46:39.786513783 +0900
-+++ b/storage/innobase/handler/i_s.cc  2010-12-06 19:28:52.270226921 +0900
+--- a/storage/innobase/handler/i_s.cc
++++ b/storage/innobase/handler/i_s.cc
 @@ -51,6 +51,7 @@
  #include "trx0sys.h" /* for trx_sys */
  #include "dict0dict.h" /* for dict_sys */
@@ -68,10 +65,10 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
 +#include "btr0btr.h" /* for btr_page_get_index_id */
  }
  
- static const char plugin_author[] = "Innobase Oy";
-@@ -4328,3 +4329,701 @@
-       STRUCT_FLD(system_vars, NULL),
-       STRUCT_FLD(__reserved1, NULL)
+ #define OK(expr)              \
+@@ -4411,3 +4412,713 @@
+       STRUCT_FLD(__reserved1, NULL),
+       STRUCT_FLD(flags, 0UL)
  };
 +
 +/***********************************************************************
@@ -456,7 +453,7 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
 +                              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);
@@ -640,7 +637,7 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
 +
 +      /* plugin author (for SHOW PLUGINS) */
 +      /* const char* */
-+      STRUCT_FLD(author, plugin_author),
++      STRUCT_FLD(author, "Percona"),
 +
 +      /* general descriptive text (for SHOW PLUGINS) */
 +      /* const char* */
@@ -670,7 +667,11 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
 +
 +      /* 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 =
@@ -689,7 +690,7 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
 +
 +      /* plugin author (for SHOW PLUGINS) */
 +      /* const char* */
-+      STRUCT_FLD(author, plugin_author),
++      STRUCT_FLD(author, "Percona"),
 +
 +      /* general descriptive text (for SHOW PLUGINS) */
 +      /* const char* */
@@ -719,7 +720,11 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
 +
 +      /* 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 =
@@ -738,7 +743,7 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
 +
 +      /* plugin author (for SHOW PLUGINS) */
 +      /* const char* */
-+      STRUCT_FLD(author, plugin_author),
++      STRUCT_FLD(author, "Percona"),
 +
 +      /* general descriptive text (for SHOW PLUGINS) */
 +      /* const char* */
@@ -768,13 +773,16 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
 +
 +      /* reserved for dependency checking */
 +      /* void* */
-+      STRUCT_FLD(__reserved1, NULL)
++      STRUCT_FLD(__reserved1, NULL),
++
++      /* flags for plugin */
++      /* unsigned long */
++      STRUCT_FLD(flags, 0UL)
 +};
 +
-diff -ruN a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h
---- a/storage/innobase/handler/i_s.h   2010-12-04 19:46:39.657513849 +0900
-+++ b/storage/innobase/handler/i_s.h   2010-12-06 19:23:47.635192988 +0900
-@@ -45,5 +45,8 @@
+--- a/storage/innobase/handler/i_s.h
++++ b/storage/innobase/handler/i_s.h
+@@ -47,5 +47,8 @@
  extern struct st_mysql_plugin i_s_innodb_table_stats;
  extern struct st_mysql_plugin i_s_innodb_index_stats;
  extern struct st_mysql_plugin i_s_innodb_admin_command;
@@ -783,10 +791,9 @@ diff -ruN a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h
 +extern struct st_mysql_plugin i_s_innodb_buffer_pool_pages_blob;
  
  #endif /* i_s_h */
-diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
---- a/storage/innobase/include/buf0buf.h       2010-12-04 19:46:40.197471531 +0900
-+++ b/storage/innobase/include/buf0buf.h       2010-12-06 19:23:47.638195824 +0900
-@@ -1143,6 +1143,14 @@
+--- a/storage/innobase/include/buf0buf.h
++++ b/storage/innobase/include/buf0buf.h
+@@ -1181,6 +1181,14 @@
  /*===========*/
        const buf_pool_t*       buf_pool)       /*!< in: buffer pool */
        __attribute__((nonnull, const));
MySQL: a very fast and reliable SQL database engine
This page took 0.032438 seconds and 4 git commands to generate.