~percona-dev/percona-server/release-5.5.11-20.2-fix-bug-764138

« back to all changes in this revision

Viewing changes to innodb_fast_checksum.patch

  • Committer: Ignacio Nin
  • Date: 2011-03-27 18:30:06 UTC
  • mfrom: (88.2.3 5.5.10)
  • Revision ID: ignacio.nin@percona.com-20110327183006-ij0o2pdyhzaerish
Merge 5.5.10 changes

Merge 5.5.10 changes to release-5.5.9-20.1 in order to create release-5.5.10-20.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
170
170
 static my_bool innobase_recovery_stats                 = TRUE;
171
171
 static my_bool innobase_locks_unsafe_for_binlog        = FALSE;
172
172
 static my_bool innobase_overwrite_relay_log_info       = FALSE;
173
 
@@ -2574,6 +2575,7 @@
 
173
@@ -2593,6 +2594,7 @@
174
174
 
175
175
        srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
176
176
        srv_use_checksums = (ibool) innobase_use_checksums;
178
178
 
179
179
 #ifdef HAVE_LARGE_PAGES
180
180
         if ((os_use_large_pages = (ibool) my_use_large_pages))
181
 
@@ -11324,6 +11326,15 @@
 
181
@@ -11397,6 +11399,15 @@
182
182
   "Disable with --skip-innodb-checksums.",
183
183
   NULL, NULL, TRUE);
184
184
 
194
194
 static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
195
195
   PLUGIN_VAR_READONLY,
196
196
   "The common part for InnoDB table spaces.",
197
 
@@ -11842,6 +11853,7 @@
 
197
@@ -11903,6 +11914,7 @@
198
198
   MYSQL_SYSVAR(buffer_pool_size),
199
199
   MYSQL_SYSVAR(buffer_pool_instances),
200
200
   MYSQL_SYSVAR(checksums),
231
231
diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
232
232
--- a/storage/innobase/include/srv0srv.h        2010-12-04 15:52:23.474482590 +0900
233
233
+++ b/storage/innobase/include/srv0srv.h        2010-12-04 15:53:45.048512100 +0900
234
 
@@ -226,6 +226,7 @@
 
234
@@ -227,6 +227,7 @@
235
235
 
236
236
 extern ibool   srv_use_doublewrite_buf;
237
237
 extern ibool   srv_use_checksums;
291
291
diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
292
292
--- a/storage/innobase/srv/srv0srv.c    2010-12-04 15:52:23.498513634 +0900
293
293
+++ b/storage/innobase/srv/srv0srv.c    2010-12-04 15:53:45.053550283 +0900
294
 
@@ -414,6 +414,7 @@
 
294
@@ -418,6 +418,7 @@
295
295
 
296
296
 UNIV_INTERN ibool      srv_use_doublewrite_buf = TRUE;
297
297
 UNIV_INTERN ibool      srv_use_checksums = TRUE;