- up to 5.5.19

[packages/mysql.git] / innodb_files_extend.patch

diff --git a/innodb_files_extend.patch b/innodb_files_extend.patch
index 9aa4048704b2602904694c95fc0427e4e757e9c8..65592ac040d954daac53aad166ee1afea2848f1a 100644 (file)
--- a/innodb_files_extend.patch
+++ b/innodb_files_extend.patch
@@ -16,7 +16,7 @@
                        fprintf(stderr,
                                "InnoDB: Error: the size of single-table"
                                " tablespace file %s\n"
-@@ -4152,7 +4152,7 @@
+@@ -4161,7 +4161,7 @@
  
        size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
  #ifndef UNIV_HOTBACKUP
@@ -25,7 +25,7 @@
                fprintf(stderr,
                        "InnoDB: Error: the size of single-table tablespace"
                        " file %s\n"
-@@ -4172,7 +4172,7 @@
+@@ -4181,7 +4181,7 @@
        /* Align the memory for file i/o if we might have O_DIRECT set */
        page = ut_align(buf2, UNIV_PAGE_SIZE);
  
@@ -34,7 +34,7 @@
                success = os_file_read(file, page, 0, 0, UNIV_PAGE_SIZE);
  
                /* We have to read the tablespace id from the file */
-@@ -5150,9 +5150,9 @@
+@@ -5159,9 +5159,9 @@
        ut_ad(ut_is_2pow(zip_size));
        ut_ad(buf);
        ut_ad(len > 0);
@@ -175,7 +175,7 @@
  #ifndef MYSQL_SERVER
        innodb_overwrite_relay_log_info = FALSE;
  #endif
-@@ -7291,9 +7353,9 @@
+@@ -7290,9 +7352,9 @@
                                | DICT_TF_COMPACT
                                | DICT_TF_FORMAT_ZIP
                                << DICT_TF_FORMAT_SHIFT;
@@ -188,7 +188,7 @@
                }
        }
  
-@@ -11544,6 +11606,16 @@
+@@ -11553,6 +11615,16 @@
    "#### Attention: The checksum is not compatible for normal or disabled version! ####",
    NULL, NULL, FALSE);
  
@@ -205,7 +205,7 @@
  static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
    PLUGIN_VAR_READONLY,
    "The common part for InnoDB table spaces.",
-@@ -12070,6 +12142,8 @@
+@@ -12079,6 +12151,8 @@
    NULL, NULL, 0, &corrupt_table_action_typelib);
  
  static struct st_mysql_sys_var* innobase_system_variables[]= {