- no need for su, log dir is not writable by non-root uid/gid

[packages/mysql.git] / innodb_recovery_patches.patch

diff --git a/innodb_recovery_patches.patch b/innodb_recovery_patches.patch
index d836a8ab4d34627ce88d97bc8228e232333d1be3..0972c42d5018087c608c8ade6eb22d0067077262 100644 (file)
--- a/innodb_recovery_patches.patch
+++ b/innodb_recovery_patches.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/buf0rea.c b/storage/innobase/buf/buf0rea.c
---- a/storage/innobase/buf/buf0rea.c   2010-12-03 15:49:59.187028943 +0900
-+++ b/storage/innobase/buf/buf0rea.c   2010-12-03 17:30:41.579956150 +0900
-@@ -122,6 +122,46 @@
+--- a/storage/innobase/buf/buf0rea.c
++++ b/storage/innobase/buf/buf0rea.c
+@@ -124,6 +124,46 @@
        bpage = buf_page_init_for_read(err, mode, space, zip_size, unzip,
                                       tablespace_version, offset);
        if (bpage == NULL) {
@@ -55,7 +54,7 @@ diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c
  
                return(0);
        }
-@@ -610,6 +650,50 @@
+@@ -777,6 +817,50 @@
                /* It is a single table tablespace and the .ibd file is
                missing: do nothing */
  
@@ -106,9 +105,8 @@ diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c
                return;
        }
  
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc    2010-12-03 17:30:16.261955714 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc    2010-12-03 17:30:41.584971130 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -182,6 +182,7 @@
  #endif /* UNIV_LOG_ARCHIVE */
  static my_bool        innobase_use_doublewrite                = TRUE;
@@ -117,7 +115,7 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
  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;
-@@ -2576,6 +2577,8 @@
+@@ -2610,6 +2611,8 @@
  
        srv_force_recovery = (ulint) innobase_force_recovery;
  
@@ -126,7 +124,7 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
        srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
        srv_use_checksums = (ibool) innobase_use_checksums;
  
-@@ -11274,6 +11277,11 @@
+@@ -11390,6 +11393,11 @@
    "The common part for InnoDB table spaces.",
    NULL, NULL, NULL);
  
@@ -138,7 +136,7 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
  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 "
-@@ -11747,6 +11755,7 @@
+@@ -11918,6 +11926,7 @@
    MYSQL_SYSVAR(data_file_path),
    MYSQL_SYSVAR(data_home_dir),
    MYSQL_SYSVAR(doublewrite),
@@ -146,9 +144,8 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
    MYSQL_SYSVAR(fast_shutdown),
    MYSQL_SYSVAR(file_io_threads),
    MYSQL_SYSVAR(read_io_threads),
-diff -ruN a/storage/innobase/include/log0recv.h b/storage/innobase/include/log0recv.h
---- a/storage/innobase/include/log0recv.h      2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/log0recv.h      2010-12-03 17:30:41.592958318 +0900
+--- a/storage/innobase/include/log0recv.h
++++ b/storage/innobase/include/log0recv.h
 @@ -438,6 +438,39 @@
        hash_table_t*   addr_hash;/*!< hash table of file addresses of pages */
        ulint           n_addrs;/*!< number of not processed hashed file
@@ -189,9 +186,8 @@ diff -ruN a/storage/innobase/include/log0recv.h b/storage/innobase/include/log0r
  };
  
  /** The recovery system */
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h       2010-12-03 17:30:16.321953515 +0900
-+++ b/storage/innobase/include/srv0srv.h       2010-12-03 17:30:41.593985184 +0900
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
 @@ -126,6 +126,8 @@
  extern ulint* srv_data_file_sizes;
  extern ulint* srv_data_file_is_raw_partition;
@@ -201,9 +197,8 @@ diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0sr
  extern ibool  srv_auto_extend_last_data_file;
  extern ulint  srv_last_file_size_max;
  extern char** srv_log_group_home_dirs;
-diff -ruN a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c
---- a/storage/innobase/log/log0recv.c  2010-12-03 15:18:48.903987466 +0900
-+++ b/storage/innobase/log/log0recv.c  2010-12-03 17:30:41.598022536 +0900
+--- a/storage/innobase/log/log0recv.c
++++ b/storage/innobase/log/log0recv.c
 @@ -187,6 +187,9 @@
  
        recv_sys->heap = NULL;
@@ -430,9 +425,8 @@ diff -ruN a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c
        if (recv_needed_recovery) {
                trx_sys_print_mysql_master_log_pos();
                trx_sys_print_mysql_binlog_offset();
-diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
---- a/storage/innobase/os/os0file.c    2010-12-03 15:18:48.908955759 +0900
-+++ b/storage/innobase/os/os0file.c    2010-12-03 17:30:41.602022989 +0900
+--- a/storage/innobase/os/os0file.c
++++ b/storage/innobase/os/os0file.c
 @@ -43,6 +43,7 @@
  #include "srv0start.h"
  #include "fil0fil.h"
@@ -441,7 +435,7 @@ diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
  #ifndef UNIV_HOTBACKUP
  # include "os0sync.h"
  # include "os0thread.h"
-@@ -4260,6 +4261,18 @@
+@@ -4278,6 +4279,18 @@
                                           INFINITE);
        }
  
@@ -460,9 +454,8 @@ diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
        os_mutex_enter(array->mutex);
  
        if (srv_shutdown_state == SRV_SHUTDOWN_EXIT_THREADS
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c   2010-12-03 17:30:16.339955597 +0900
-+++ b/storage/innobase/srv/srv0srv.c   2010-12-03 17:30:41.604958138 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -160,6 +160,8 @@
  /* size in database pages */
  UNIV_INTERN ulint*    srv_data_file_sizes = NULL;
@@ -472,9 +465,8 @@ diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
  /* if TRUE, then we auto-extend the last data file */
  UNIV_INTERN ibool     srv_auto_extend_last_data_file  = FALSE;
  /* if != 0, this tells the max size auto-extending may increase the
-diff -ruN a/storage/innobase/trx/trx0sys.c b/storage/innobase/trx/trx0sys.c
---- a/storage/innobase/trx/trx0sys.c   2010-12-03 15:41:52.051986524 +0900
-+++ b/storage/innobase/trx/trx0sys.c   2010-12-03 17:30:41.607026818 +0900
+--- a/storage/innobase/trx/trx0sys.c
++++ b/storage/innobase/trx/trx0sys.c
 @@ -567,6 +567,12 @@
                               zip_size ? zip_size : UNIV_PAGE_SIZE,
                               read_buf, NULL);