← Back to branch summary

~rodrigo-gadea-percona/percona-server/ps-docs

« back to all changes in this revision

Viewing changes to patches/innodb_recovery_patches.patch

  • Committer: Rodrigo Gadea
  • Date: 2011-08-18 03:29:05 UTC
  • mfrom: (148.1.4 valgrind-zlib-fix)
  • Revision ID: rodrigo.gadea@percona.com-20110818032905-sdvhml23nt4n4r26
Merging divergence

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/innodb_recovery_patches.patch
5
5
#!!! notice !!!
6
6
# Any small change to this file in the main branch
7
7
# should be done or reviewed by the maintainer!
8
 
diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c
9
 
--- a/storage/innobase/buf/buf0rea.c    2010-12-03 15:49:59.187028943 +0900
10
 
+++ b/storage/innobase/buf/buf0rea.c    2010-12-03 17:30:41.579956150 +0900
 
8
--- a/storage/innobase/buf/buf0rea.c
 
9
+++ b/storage/innobase/buf/buf0rea.c
11
10
@@ -122,6 +122,46 @@
12
11
        bpage = buf_page_init_for_read(err, mode, space, zip_size, unzip,
13
12
                                       tablespace_version, offset);
106
105
                return;
107
106
        }
108
107
 
109
 
diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
110
 
--- a/storage/innobase/handler/ha_innodb.cc     2010-12-03 17:30:16.261955714 +0900
111
 
+++ b/storage/innobase/handler/ha_innodb.cc     2010-12-03 17:30:41.584971130 +0900
 
108
--- a/storage/innobase/handler/ha_innodb.cc
 
109
+++ b/storage/innobase/handler/ha_innodb.cc
112
110
@@ -182,6 +182,7 @@
113
111
 #endif /* UNIV_LOG_ARCHIVE */
114
112
 static my_bool innobase_use_doublewrite                = TRUE;
117
115
 static my_bool innobase_locks_unsafe_for_binlog        = FALSE;
118
116
 static my_bool innobase_overwrite_relay_log_info       = FALSE;
119
117
 static my_bool innobase_rollback_on_timeout            = FALSE;
120
 
@@ -2582,6 +2583,8 @@
 
118
@@ -2581,6 +2582,8 @@
121
119
 
122
120
        srv_force_recovery = (ulint) innobase_force_recovery;
123
121
 
126
124
        srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
127
125
        srv_use_checksums = (ibool) innobase_use_checksums;
128
126
 
129
 
@@ -11286,6 +11289,11 @@
 
127
@@ -11285,6 +11288,11 @@
130
128
   "The common part for InnoDB table spaces.",
131
129
   NULL, NULL, NULL);
132
130
 
138
136
 static MYSQL_SYSVAR_BOOL(recovery_update_relay_log, innobase_overwrite_relay_log_info,
139
137
   PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
140
138
   "During InnoDB crash recovery on slave overwrite relay-log.info "
141
 
@@ -11764,6 +11772,7 @@
 
139
@@ -11763,6 +11771,7 @@
142
140
   MYSQL_SYSVAR(data_file_path),
143
141
   MYSQL_SYSVAR(data_home_dir),
144
142
   MYSQL_SYSVAR(doublewrite),
146
144
   MYSQL_SYSVAR(fast_shutdown),
147
145
   MYSQL_SYSVAR(file_io_threads),
148
146
   MYSQL_SYSVAR(read_io_threads),
149
 
diff -ruN a/storage/innobase/include/log0recv.h b/storage/innobase/include/log0recv.h
150
 
--- a/storage/innobase/include/log0recv.h       2010-11-03 07:01:13.000000000 +0900
151
 
+++ b/storage/innobase/include/log0recv.h       2010-12-03 17:30:41.592958318 +0900
 
147
--- a/storage/innobase/include/log0recv.h
 
148
+++ b/storage/innobase/include/log0recv.h
152
149
@@ -438,6 +438,39 @@
153
150
        hash_table_t*   addr_hash;/*!< hash table of file addresses of pages */
154
151
        ulint           n_addrs;/*!< number of not processed hashed file
189
186
 };
190
187
 
191
188
 /** The recovery system */
192
 
diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
193
 
--- a/storage/innobase/include/srv0srv.h        2010-12-03 17:30:16.321953515 +0900
194
 
+++ b/storage/innobase/include/srv0srv.h        2010-12-03 17:30:41.593985184 +0900
 
189
--- a/storage/innobase/include/srv0srv.h
 
190
+++ b/storage/innobase/include/srv0srv.h
195
191
@@ -126,6 +126,8 @@
196
192
 extern ulint*  srv_data_file_sizes;
197
193
 extern ulint*  srv_data_file_is_raw_partition;
201
197
 extern ibool   srv_auto_extend_last_data_file;
202
198
 extern ulint   srv_last_file_size_max;
203
199
 extern char**  srv_log_group_home_dirs;
204
 
diff -ruN a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c
205
 
--- a/storage/innobase/log/log0recv.c   2010-12-03 15:18:48.903987466 +0900
206
 
+++ b/storage/innobase/log/log0recv.c   2010-12-03 17:30:41.598022536 +0900
 
200
--- a/storage/innobase/log/log0recv.c
 
201
+++ b/storage/innobase/log/log0recv.c
207
202
@@ -187,6 +187,9 @@
208
203
 
209
204
        recv_sys->heap = NULL;
430
425
        if (recv_needed_recovery) {
431
426
                trx_sys_print_mysql_master_log_pos();
432
427
                trx_sys_print_mysql_binlog_offset();
433
 
diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
434
 
--- a/storage/innobase/os/os0file.c     2010-12-03 15:18:48.908955759 +0900
435
 
+++ b/storage/innobase/os/os0file.c     2010-12-03 17:30:41.602022989 +0900
 
428
--- a/storage/innobase/os/os0file.c
 
429
+++ b/storage/innobase/os/os0file.c
436
430
@@ -43,6 +43,7 @@
437
431
 #include "srv0start.h"
438
432
 #include "fil0fil.h"
460
454
        os_mutex_enter(array->mutex);
461
455
 
462
456
        if (srv_shutdown_state == SRV_SHUTDOWN_EXIT_THREADS
463
 
diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
464
 
--- a/storage/innobase/srv/srv0srv.c    2010-12-03 17:30:16.339955597 +0900
465
 
+++ b/storage/innobase/srv/srv0srv.c    2010-12-03 17:30:41.604958138 +0900
 
457
--- a/storage/innobase/srv/srv0srv.c
 
458
+++ b/storage/innobase/srv/srv0srv.c
466
459
@@ -160,6 +160,8 @@
467
460
 /* size in database pages */
468
461
 UNIV_INTERN ulint*     srv_data_file_sizes = NULL;
472
465
 /* if TRUE, then we auto-extend the last data file */
473
466
 UNIV_INTERN ibool      srv_auto_extend_last_data_file  = FALSE;
474
467
 /* if != 0, this tells the max size auto-extending may increase the
475
 
diff -ruN a/storage/innobase/trx/trx0sys.c b/storage/innobase/trx/trx0sys.c
476
 
--- a/storage/innobase/trx/trx0sys.c    2010-12-03 15:41:52.051986524 +0900
477
 
+++ b/storage/innobase/trx/trx0sys.c    2010-12-03 17:30:41.607026818 +0900
 
468
--- a/storage/innobase/trx/trx0sys.c
 
469
+++ b/storage/innobase/trx/trx0sys.c
478
470
@@ -567,6 +567,12 @@
479
471
                               zip_size ? zip_size : UNIV_PAGE_SIZE,
480
472
                               read_buf, NULL);