← Back to branch summary

~tsarev/percona-server/5.5-processlist_rows_stats-sporadic_fails-fix

« back to all changes in this revision

Viewing changes to innodb_recovery_patches.patch

  • Committer: kinoyasu
  • Date: 2011-05-10 11:57:42 UTC
  • Revision ID: kinoyasu@gauntlet4-20110510115742-3i3194rn2m8fipm2
port Yasufumi patches to 5.5.12

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_recovery_patches.patch
55
55
 
56
56
                return(0);
57
57
        }
58
 
@@ -613,6 +653,50 @@
 
58
@@ -610,6 +650,50 @@
59
59
                /* It is a single table tablespace and the .ibd file is
60
60
                missing: do nothing */
61
61
 
117
117
 static my_bool innobase_locks_unsafe_for_binlog        = FALSE;
118
118
 static my_bool innobase_overwrite_relay_log_info       = FALSE;
119
119
 static my_bool innobase_rollback_on_timeout            = FALSE;
120
 
@@ -2549,6 +2550,8 @@
 
120
@@ -2562,6 +2563,8 @@
121
121
 
122
122
        srv_force_recovery = (ulint) innobase_force_recovery;
123
123
 
126
126
        srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
127
127
        srv_use_checksums = (ibool) innobase_use_checksums;
128
128
 
129
 
@@ -11250,6 +11253,11 @@
 
129
@@ -11267,6 +11270,11 @@
130
130
   "The common part for InnoDB table spaces.",
131
131
   NULL, NULL, NULL);
132
132
 
138
138
 static MYSQL_SYSVAR_BOOL(recovery_update_relay_log, innobase_overwrite_relay_log_info,
139
139
   PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
140
140
   "During InnoDB crash recovery on slave overwrite relay-log.info "
141
 
@@ -11723,6 +11731,7 @@
 
141
@@ -11740,6 +11748,7 @@
142
142
   MYSQL_SYSVAR(data_file_path),
143
143
   MYSQL_SYSVAR(data_home_dir),
144
144
   MYSQL_SYSVAR(doublewrite),
463
463
diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
464
464
--- a/storage/innobase/srv/srv0srv.c    2010-12-03 17:30:16.339955597 +0900
465
465
+++ b/storage/innobase/srv/srv0srv.c    2010-12-03 17:30:41.604958138 +0900
466
 
@@ -167,6 +167,8 @@
 
466
@@ -166,6 +166,8 @@
467
467
 /* size in database pages */
468
468
 UNIV_INTERN ulint*     srv_data_file_sizes = NULL;
469
469