Merge lp:~percona-dev/percona-server/release-5.1.53-fix_bug690144 into lp:~percona-dev/percona-server/release-5.1.53

[Yasufumi Kinoshita]

[Vadim Tkachenko (vadim-tk)]

OK

review: Approve

=== modified file 'innodb_buffer_pool_shm.patch'
--- innodb_buffer_pool_shm.patch	2010-12-14 08:51:49 +0000
+++ innodb_buffer_pool_shm.patch	2010-12-15 02:21:43 +0000
@@ -1125,7 +1125,7 @@
 diff -ruN a/storage/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
 --- a/storage/innodb_plugin/srv/srv0start.c	2010-07-14 16:33:23.851391514 +0900
 +++ b/storage/innodb_plugin/srv/srv0start.c	2010-07-14 16:40:16.180321173 +0900
-@@ -1708,6 +1708,8 @@
+@@ -1724,6 +1724,8 @@
  		Note that this is not as heavy weight as it seems. At
  		this point there will be only ONE page in the buf_LRU
  		and there must be no page in the buf_flush list. */

=== modified file 'innodb_fix_misc.patch'
--- innodb_fix_misc.patch	2010-12-14 08:51:49 +0000
+++ innodb_fix_misc.patch	2010-12-15 02:21:43 +0000
@@ -113,7 +113,7 @@
 diff -ruN a/storage/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
 --- a/storage/innodb_plugin/srv/srv0start.c	2010-04-30 16:37:05.000000000 +0900
 +++ b/storage/innodb_plugin/srv/srv0start.c	2010-04-30 16:41:46.000000000 +0900
-@@ -1967,7 +1967,7 @@
+@@ -1986,7 +1986,7 @@
  	if (srv_print_verbose_log) {
  		ut_print_timestamp(stderr);
  		fprintf(stderr,

=== modified file 'innodb_pass_corrupt_table.patch'
--- innodb_pass_corrupt_table.patch	2010-12-14 08:51:49 +0000
+++ innodb_pass_corrupt_table.patch	2010-12-15 02:21:43 +0000
@@ -1354,7 +1354,7 @@
 diff -ruN a/storage/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
 --- a/storage/innodb_plugin/srv/srv0start.c	2010-08-27 16:38:38.290021700 +0900
 +++ b/storage/innodb_plugin/srv/srv0start.c	2010-08-27 16:39:03.052021423 +0900
-@@ -1955,6 +1955,13 @@
+@@ -1974,6 +1974,13 @@
  
  	os_fast_mutex_free(&srv_os_test_mutex);
  

=== modified file 'innodb_separate_doublewrite.patch'
--- innodb_separate_doublewrite.patch	2010-12-14 08:51:49 +0000
+++ innodb_separate_doublewrite.patch	2010-12-15 02:21:43 +0000
@@ -720,21 +720,54 @@
  #ifdef UNIV_LOG_ARCHIVE
  					&min_arch_log_no, &max_arch_log_no,
  #endif /* UNIV_LOG_ARCHIVE */
-@@ -1629,6 +1769,14 @@
+@@ -1504,6 +1644,15 @@
+ 		mtr_commit(&mtr);
+ 
+ 		trx_sys_create();
++
++		if (create_new_doublewrite_file) {
++			mtr_start(&mtr);
++			fsp_header_init(TRX_DOUBLEWRITE_SPACE, TRX_SYS_DOUBLEWRITE_BLOCK_SIZE * 9, &mtr);
++			mtr_commit(&mtr);
++
++			trx_sys_dummy_create(TRX_DOUBLEWRITE_SPACE);
++		}
++
+ 		dict_create();
+ 		srv_startup_is_before_trx_rollback_phase = FALSE;
+ 
+@@ -1541,6 +1690,13 @@
+ 		recv_recovery_from_archive_finish();
+ #endif /* UNIV_LOG_ARCHIVE */
+ 	} else {
++		char*	save_srv_doublewrite_file = NULL;
++
++		if (create_new_doublewrite_file) {
++			/* doublewrite_file cannot be used for recovery yet. */
++			save_srv_doublewrite_file = srv_doublewrite_file;
++			srv_doublewrite_file = NULL;
++		}
+ 
+ 		/* Check if we support the max format that is stamped
+ 		on the system tablespace. 
+@@ -1627,6 +1783,17 @@
+ 		we have finished the recovery process so that the
+ 		image of TRX_SYS_PAGE_NO is not stale. */
  		trx_sys_file_format_tag_init();
++
++		if (create_new_doublewrite_file) {
++			/* restore the value */
++			srv_doublewrite_file = save_srv_doublewrite_file;
++
++			mtr_start(&mtr);
++			fsp_header_init(TRX_DOUBLEWRITE_SPACE, TRX_SYS_DOUBLEWRITE_BLOCK_SIZE * 9, &mtr);
++			mtr_commit(&mtr);
++
++			trx_sys_dummy_create(TRX_DOUBLEWRITE_SPACE);
++		}
  	}
  
-+	if (create_new_doublewrite_file) {
-+		mtr_start(&mtr);
-+		fsp_header_init(TRX_DOUBLEWRITE_SPACE, TRX_SYS_DOUBLEWRITE_BLOCK_SIZE * 9, &mtr);
-+		mtr_commit(&mtr);
-+
-+		trx_sys_dummy_create(TRX_DOUBLEWRITE_SPACE);
-+	}
-+
  	if (!create_new_db && sum_of_new_sizes > 0) {
- 		/* New data file(s) were added */
- 		mtr_start(&mtr);
 diff -ruN a/storage/innodb_plugin/trx/trx0sys.c b/storage/innodb_plugin/trx/trx0sys.c
 --- a/storage/innodb_plugin/trx/trx0sys.c	2010-08-27 16:23:31.045058700 +0900
 +++ b/storage/innodb_plugin/trx/trx0sys.c	2010-08-27 16:37:55.421992951 +0900