#!!! 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) {
return(0);
}
-@@ -613,6 +653,50 @@
+@@ -777,6 +817,50 @@
/* It is a single table tablespace and the .ibd file is
missing: do nothing */
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;
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;
-@@ -2529,6 +2530,8 @@
+@@ -2610,6 +2611,8 @@
srv_force_recovery = (ulint) innobase_force_recovery;
srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
srv_use_checksums = (ibool) innobase_use_checksums;
-@@ -11170,6 +11173,11 @@
+@@ -11390,6 +11393,11 @@
"The common part for InnoDB table spaces.",
NULL, NULL, NULL);
+ "Output statistics of recovery process after it.",
+ NULL, NULL, FALSE);
+
- static MYSQL_SYSVAR_BOOL(overwrite_relay_log_info, innobase_overwrite_relay_log_info,
+ 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 "
-@@ -11658,6 +11666,7 @@
+@@ -11918,6 +11926,7 @@
MYSQL_SYSVAR(data_file_path),
MYSQL_SYSVAR(data_home_dir),
MYSQL_SYSVAR(doublewrite),
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
};
/** 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
-@@ -129,6 +129,8 @@
+--- 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;
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;
+ ulint i;
+
+ fprintf(stderr,
-+ "InnoDB: Applying log records was done. Its statistics are followings.\n");
++ "InnoDB: Log records have been applied. The statistics that were gathered follow.\n");
+
+ fprintf(stderr,
+ "============================================================\n"
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"
#ifndef UNIV_HOTBACKUP
# include "os0sync.h"
# include "os0thread.h"
-@@ -4237,6 +4238,18 @@
- os_thread_exit(NULL);
+@@ -4278,6 +4279,18 @@
+ INFINITE);
}
+ if (srv_recovery_stats && recv_recovery_is_on() && n_consecutive) {
+
os_mutex_enter(array->mutex);
- slot = os_aio_array_get_nth_slot(array, i + segment * n);
-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
-@@ -165,6 +165,8 @@
+ if (srv_shutdown_state == SRV_SHUTDOWN_EXIT_THREADS
+--- 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;
/* 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
-@@ -566,6 +566,12 @@
+--- 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);
/* Check if the page is corrupt */
if (UNIV_UNLIKELY
-@@ -613,6 +619,13 @@
+@@ -614,6 +620,13 @@
zip_size, page_no, 0,
zip_size ? zip_size : UNIV_PAGE_SIZE,
page, NULL);
projects / packages / mysql.git / blobdiff