- updated to 5.5.32

[packages/mysql.git] / innodb_buffer_pool_shm.patch

diff --git a/innodb_buffer_pool_shm.patch b/innodb_buffer_pool_shm.patch
index fe0bbf5b9926b2607d9ebb8d0e688a7defd68be6..3dca118b6be4967b23e19ac634c44601ff6117da 100644 (file)
--- a/innodb_buffer_pool_shm.patch
+++ b/innodb_buffer_pool_shm.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
-@@ -1006,10 +1006,12 @@
+@@ -1022,10 +1022,12 @@
        buf_block_t*    block;
        byte*           frame;
        ulint           i;
@@ -20,7 +20,7 @@
        /* 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;
        }
  
@@ -42,7 +42,7 @@
  
  
  static char*  internal_innobase_data_file_path        = NULL;
-@@ -2675,6 +2677,12 @@
+@@ -2706,6 +2708,12 @@
        srv_buf_pool_size = (ulint) innobase_buffer_pool_size;
        srv_buf_pool_instances = (ulint) innobase_buffer_pool_instances;
  
@@ -55,7 +55,7 @@
        srv_mem_pool_size = (ulint) innobase_additional_mem_pool_size;
  
        srv_n_file_io_threads = (ulint) innobase_file_io_threads;
-@@ -11749,6 +11757,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);
  
@@ -72,7 +72,7 @@
  static MYSQL_SYSVAR_ULONG(commit_concurrency, innobase_commit_concurrency,
    PLUGIN_VAR_RQCMDARG,
    "Helps in performance tuning in heavily concurrent environments.",
-@@ -12043,6 +12061,8 @@
+@@ -12209,6 +12227,8 @@
    MYSQL_SYSVAR(autoextend_increment),
    MYSQL_SYSVAR(buffer_pool_size),
    MYSQL_SYSVAR(buffer_pool_instances),
@@ -81,3 +81,19 @@
    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%';