cosmetics: make unix socket mouse selectable in terminal

[packages/mysql.git] / innodb_recovery_patches.patch

diff --git a/innodb_recovery_patches.patch b/innodb_recovery_patches.patch
index 0ee2be3cde1d3ecc624475a354da46c3dfc68606..0972c42d5018087c608c8ade6eb22d0067077262 100644 (file)
--- a/innodb_recovery_patches.patch
+++ b/innodb_recovery_patches.patch
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/buf/buf0rea.c
 +++ b/storage/innobase/buf/buf0rea.c
-@@ -122,6 +122,46 @@
+@@ -124,6 +124,46 @@
        bpage = buf_page_init_for_read(err, mode, space, zip_size, unzip,
                                       tablespace_version, offset);
        if (bpage == NULL) {
@@ -54,7 +54,7 @@
  
                return(0);
        }
-@@ -610,6 +650,50 @@
+@@ -777,6 +817,50 @@
                /* It is a single table tablespace and the .ibd file is
                missing: do nothing */
  
@@ -115,7 +115,7 @@
  static my_bool        innobase_locks_unsafe_for_binlog        = FALSE;
  static my_bool        innobase_overwrite_relay_log_info       = FALSE;
  static my_bool        innobase_rollback_on_timeout            = FALSE;
-@@ -2581,6 +2582,8 @@
+@@ -2610,6 +2611,8 @@
  
        srv_force_recovery = (ulint) innobase_force_recovery;
  
@@ -124,7 +124,7 @@
        srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
        srv_use_checksums = (ibool) innobase_use_checksums;
  
-@@ -11285,6 +11288,11 @@
+@@ -11390,6 +11393,11 @@
    "The common part for InnoDB table spaces.",
    NULL, NULL, NULL);
  
@@ -136,7 +136,7 @@
  static MYSQL_SYSVAR_BOOL(recovery_update_relay_log, innobase_overwrite_relay_log_info,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
    "During InnoDB crash recovery on slave overwrite relay-log.info "
-@@ -11763,6 +11771,7 @@
+@@ -11918,6 +11926,7 @@
    MYSQL_SYSVAR(data_file_path),
    MYSQL_SYSVAR(data_home_dir),
    MYSQL_SYSVAR(doublewrite),