- rel. 2

[packages/mysql.git] / innodb_fast_checksum.patch

diff --git a/innodb_fast_checksum.patch b/innodb_fast_checksum.patch
index 382c401bc8921956b5e4bb218fa5635d41274e05..0a733db006f9d18e09fba52ef7455a19a0d2717c 100644 (file)
--- a/innodb_fast_checksum.patch
+++ b/innodb_fast_checksum.patch
@@ -106,7 +106,7 @@
        /* We overwrite the first 4 bytes of the end lsn field to store
 --- a/storage/innobase/fil/fil0fil.c
 +++ b/storage/innobase/fil/fil0fil.c
-@@ -3095,13 +3095,24 @@
+@@ -3103,13 +3103,24 @@
                return(TRUE);
        }
  
@@ -132,7 +132,7 @@
        return(FALSE);
  }
  
-@@ -3117,7 +3128,9 @@
+@@ -3125,7 +3136,9 @@
        if (!zip_size) {
                mach_write_to_4(page + FIL_PAGE_SPACE_OR_CHKSUM,
                                srv_use_checksums
@@ -161,7 +161,7 @@
  
        srv_blocking_lru_restore = (ibool) innobase_blocking_lru_restore;
  
-@@ -11533,6 +11535,15 @@
+@@ -11541,6 +11543,15 @@
    "Disable with --skip-innodb-checksums.",
    NULL, NULL, TRUE);
  
@@ -177,7 +177,7 @@
  static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
    PLUGIN_VAR_READONLY,
    "The common part for InnoDB table spaces.",
-@@ -12064,6 +12075,7 @@
+@@ -12112,6 +12123,7 @@
    MYSQL_SYSVAR(buffer_pool_size),
    MYSQL_SYSVAR(buffer_pool_instances),
    MYSQL_SYSVAR(checksums),
@@ -187,7 +187,7 @@
    MYSQL_SYSVAR(data_file_path),
 --- a/storage/innobase/include/buf0buf.h
 +++ b/storage/innobase/include/buf0buf.h
-@@ -634,6 +634,11 @@
+@@ -621,6 +621,11 @@
  buf_calc_page_new_checksum(
  /*=======================*/
        const byte*     page);  /*!< in: buffer page */
@@ -201,7 +201,7 @@
  looked at the first few bytes of the page. This calculates that old
 --- a/storage/innobase/include/fil0fil.h
 +++ b/storage/innobase/include/fil0fil.h
-@@ -118,6 +118,7 @@
+@@ -119,6 +119,7 @@
  #define FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID  34 /*!< starting from 4.1.x this
                                        contains the space id of the page */
  #define FIL_PAGE_DATA         38      /*!< start of the data on the page */
@@ -276,3 +276,13 @@
  
  UNIV_INTERN ulong     srv_replication_delay           = 0;
  
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_fast_checksum_basic.result
+@@ -0,0 +1,3 @@
++SELECT @@global.innodb_fast_checksum;
++@@global.innodb_fast_checksum
++0
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/t/innodb_fast_checksum_basic.test
+@@ -0,0 +1 @@
++SELECT @@global.innodb_fast_checksum;