← Back to branch summary

~percona-dev/percona-server/5.5.8-show-LRU-flushed

« back to all changes in this revision

Viewing changes to innodb_recovery_patches.patch

  • Committer: Yasufumi Kinoshita
  • Date: 2010-12-29 06:47:06 UTC
  • Revision ID: kinoyasu@rynex6-20101229064706-z8wpa0yjfqsqece4
port Yasufumi's patches to 5.5.8

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_recovery_patches.patch
109
109
diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
110
110
--- a/storage/innobase/handler/ha_innodb.cc     2010-12-03 17:30:16.261955714 +0900
111
111
+++ b/storage/innobase/handler/ha_innodb.cc     2010-12-03 17:30:41.584971130 +0900
112
 
@@ -187,6 +187,7 @@
 
112
@@ -182,6 +182,7 @@
113
113
 #endif /* UNIV_LOG_ARCHIVE */
114
114
 static my_bool innobase_use_doublewrite                = TRUE;
115
115
 static my_bool innobase_use_checksums                  = TRUE;
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
 
@@ -2500,6 +2501,8 @@
 
120
@@ -2527,6 +2528,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
 
@@ -11151,6 +11154,11 @@
 
129
@@ -11168,6 +11171,11 @@
130
130
   "The common part for InnoDB table spaces.",
131
131
   NULL, NULL, NULL);
132
132
 
138
138
 static MYSQL_SYSVAR_BOOL(overwrite_relay_log_info, 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
 
@@ -11628,6 +11636,7 @@
 
141
@@ -11652,6 +11660,7 @@
142
142
   MYSQL_SYSVAR(data_file_path),
143
143
   MYSQL_SYSVAR(data_home_dir),
144
144
   MYSQL_SYSVAR(doublewrite),
202
202
diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
203
203
--- a/storage/innobase/include/srv0srv.h        2010-12-03 17:30:16.321953515 +0900
204
204
+++ b/storage/innobase/include/srv0srv.h        2010-12-03 17:30:41.593985184 +0900
205
 
@@ -120,6 +120,8 @@
 
205
@@ -129,6 +129,8 @@
206
206
 extern ulint*  srv_data_file_sizes;
207
207
 extern ulint*  srv_data_file_is_raw_partition;
208
208
 
451
451
 #ifndef UNIV_HOTBACKUP
452
452
 # include "os0sync.h"
453
453
 # include "os0thread.h"
454
 
@@ -4219,6 +4220,18 @@
 
454
@@ -4237,6 +4238,18 @@
455
455
                os_thread_exit(NULL);
456
456
        }
457
457