- rel 2; patches updated

[packages/mysql.git] / innodb_buffer_pool_shm.patch

diff --git a/innodb_buffer_pool_shm.patch b/innodb_buffer_pool_shm.patch
index b8fd4487096cbfcfc2cefe1e65ceb2d5903198b9..3dca118b6be4967b23e19ac634c44601ff6117da 100644 (file)
--- a/innodb_buffer_pool_shm.patch
+++ b/innodb_buffer_pool_shm.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   2011-04-09 18:48:47.000000000 +0400
-+++ b/storage/innobase/buf/buf0buf.c   2011-04-09 18:48:48.000000000 +0400
-@@ -1006,10 +1006,12 @@
+--- a/storage/innobase/buf/buf0buf.c
++++ b/storage/innobase/buf/buf0buf.c
+@@ -1022,10 +1022,12 @@
        buf_block_t*    block;
        byte*           frame;
        ulint           i;
@@ -21,7 +20,7 @@ diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
        /* Reserve space for the block descriptors. */
        mem_size += ut_2pow_round((mem_size / UNIV_PAGE_SIZE) * (sizeof *block)
                                  + (UNIV_PAGE_SIZE - 1), UNIV_PAGE_SIZE);
-@@ -1047,6 +1049,10 @@
+@@ -1063,6 +1065,10 @@
                chunk->size = size;
        }
  
@@ -32,19 +31,18 @@ diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
        /* Init block structs and assign frames for them. Then we
        assign the frames to the first blocks (we already mapped the
        memory above). */
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc    2011-04-09 18:48:47.000000000 +0400
-+++ b/storage/innobase/handler/ha_innodb.cc    2011-04-09 18:48:48.000000000 +0400
-@@ -194,6 +194,8 @@
- static my_bool        innobase_create_status_file             = FALSE;
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
+@@ -195,6 +195,8 @@
  static my_bool        innobase_stats_on_metadata              = TRUE;
+ static my_bool        innobase_large_prefix                   = FALSE;
  static my_bool        innobase_use_sys_stats_table            = FALSE;
 +static my_bool        innobase_buffer_pool_shm_checksum       = TRUE;
 +static uint   innobase_buffer_pool_shm_key            = 0;
  
  
  static char*  internal_innobase_data_file_path        = NULL;
-@@ -2670,6 +2672,12 @@
+@@ -2706,6 +2708,12 @@
        srv_buf_pool_size = (ulint) innobase_buffer_pool_size;
        srv_buf_pool_instances = (ulint) innobase_buffer_pool_instances;
  
@@ -57,7 +55,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;
-@@ -11733,6 +11741,16 @@
+@@ -11863,6 +11871,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);
  
@@ -74,7 +72,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.",
-@@ -12027,6 +12045,8 @@
+@@ -12209,6 +12227,8 @@
    MYSQL_SYSVAR(autoextend_increment),
    MYSQL_SYSVAR(buffer_pool_size),
    MYSQL_SYSVAR(buffer_pool_instances),
@@ -83,3 +81,19 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
    MYSQL_SYSVAR(checksums),
    MYSQL_SYSVAR(fast_checksum),
    MYSQL_SYSVAR(commit_concurrency),
+--- /dev/null
++++ b/mysql-test/r/percona_innodb_buffer_pool_shm.result
+@@ -0,0 +1,4 @@
++show variables like 'innodb_buffer_pool_shm%';
++Variable_name Value
++innodb_buffer_pool_shm_checksum       ON
++innodb_buffer_pool_shm_key    123456
+--- /dev/null
++++ b/mysql-test/t/percona_innodb_buffer_pool_shm-master.opt
+@@ -0,0 +1 @@
++--innodb_buffer_pool_shm_key=123456
+--- /dev/null
++++ b/mysql-test/t/percona_innodb_buffer_pool_shm.test
+@@ -0,0 +1,2 @@
++--source include/have_innodb.inc
++show variables like 'innodb_buffer_pool_shm%';