- up to 5.5.10

[packages/mysql.git] / innodb_buffer_pool_shm.patch

diff --git a/innodb_buffer_pool_shm.patch b/innodb_buffer_pool_shm.patch
index 8efacadab15d52a53b932f1cc3340eab6a9da85e..088672f71a863f01fc58f686e5055a86aa359282 100644 (file)
--- a/innodb_buffer_pool_shm.patch
+++ b/innodb_buffer_pool_shm.patch
@@ -742,7 +742,7 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
  
  
  static char*  internal_innobase_data_file_path        = NULL;
-@@ -2624,6 +2625,14 @@
+@@ -2643,6 +2644,14 @@
        srv_buf_pool_size = (ulint) innobase_buffer_pool_size;
        srv_buf_pool_instances = (ulint) innobase_buffer_pool_instances;
  
@@ -757,7 +757,7 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
        srv_mem_pool_size = (ulint) innobase_additional_mem_pool_size;
  
        srv_n_file_io_threads = (ulint) innobase_file_io_threads;
-@@ -2640,6 +2649,7 @@
+@@ -2659,6 +2668,7 @@
        srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
        srv_use_checksums = (ibool) innobase_use_checksums;
        srv_fast_checksum = (ibool) innobase_fast_checksum;
@@ -765,7 +765,7 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
  
  #ifdef HAVE_LARGE_PAGES
          if ((os_use_large_pages = (ibool) my_use_large_pages))
-@@ -11648,6 +11658,16 @@
+@@ -11702,6 +11712,16 @@
    "Number of buffer pool instances, set to higher value on high-end machines to increase scalability",
    NULL, NULL, 1L, 1L, MAX_BUFFER_POOLS, 1L);
  
@@ -782,7 +782,7 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
  static MYSQL_SYSVAR_ULONG(commit_concurrency, innobase_commit_concurrency,
    PLUGIN_VAR_RQCMDARG,
    "Helps in performance tuning in heavily concurrent environments.",
-@@ -11939,6 +11959,8 @@
+@@ -12000,6 +12020,8 @@
    MYSQL_SYSVAR(autoextend_increment),
    MYSQL_SYSVAR(buffer_pool_size),
    MYSQL_SYSVAR(buffer_pool_instances),
@@ -1219,7 +1219,7 @@ diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
 diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
 --- a/storage/innobase/srv/srv0start.c 2010-12-04 20:19:29.806482628 +0900
 +++ b/storage/innobase/srv/srv0start.c 2010-12-07 16:10:14.964785346 +0900
-@@ -1835,6 +1835,8 @@
+@@ -1838,6 +1838,8 @@
                Note that this is not as heavy weight as it seems. At
                this point there will be only ONE page in the buf_LRU
                and there must be no page in the buf_flush list. */