Merge lp:~percona-dev/percona-server/5.1.57-bug684829_bug791092 into lp:~percona-dev/percona-server/5.1.57

[Yasufumi Kinoshita]

[Yasufumi Kinoshita (yasufumi-kinoshita)]

This MP is just remained for memo.
It will be merged when porting to 5.1.58.
After that this MP will be removed.

[Alexey Kopytov (akopytov)]

Merged to 5.1.57-12.8.

=== modified file 'innodb_expand_import.patch'
--- innodb_expand_import.patch	2011-03-31 08:37:59 +0000
+++ innodb_expand_import.patch	2011-06-06 03:20:54 +0000
@@ -558,6 +558,33 @@
  extern ulint	srv_extra_rsegments;
  extern ulint	srv_dict_size_limit;
  /*-------------------------------------------*/
+diff -ruN a/storage/innodb_plugin/row/row0mysql.c b/storage/innodb_plugin/row/row0mysql.c
+--- a/storage/innodb_plugin/row/row0mysql.c	2011-04-12 21:11:37.000000000 +0900
++++ b/storage/innodb_plugin/row/row0mysql.c	2011-06-06 11:14:43.838896479 +0900
+@@ -2520,6 +2520,11 @@
+ 
+ 	current_lsn = log_get_lsn();
+ 
++	/* Enlarge the fatal lock wait timeout during import. */
++	mutex_enter(&kernel_mutex);
++	srv_fatal_semaphore_wait_threshold += 7200; /* 2 hours */
++	mutex_exit(&kernel_mutex);
++
+ 	/* It is possible, though very improbable, that the lsn's in the
+ 	tablespace to be imported have risen above the current system lsn, if
+ 	a lengthy purge, ibuf merge, or rollback was performed on a backup
+@@ -2631,6 +2636,11 @@
+ 
+ 	trx->op_info = "";
+ 
++	/* Restore the fatal semaphore wait timeout */
++	mutex_enter(&kernel_mutex);
++	srv_fatal_semaphore_wait_threshold -= 7200; /* 2 hours */
++	mutex_exit(&kernel_mutex);
++
+ 	return((int) err);
+ }
+ 
 diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
 --- a/storage/innodb_plugin/srv/srv0srv.c	2010-04-29 18:58:20.000000000 +0900
 +++ b/storage/innodb_plugin/srv/srv0srv.c	2010-04-30 10:28:05.000000000 +0900

=== modified file 'innodb_pass_corrupt_table.patch'
--- innodb_pass_corrupt_table.patch	2011-05-10 07:31:20 +0000
+++ innodb_pass_corrupt_table.patch	2011-06-06 03:20:54 +0000
@@ -489,7 +489,7 @@
  			goto next_loop;
  
  		cached_foreign_tables = 0;
-@@ -4651,6 +4652,11 @@
+@@ -4657,6 +4658,11 @@
  	}
  
  	do {
@@ -501,7 +501,7 @@
  		if (UNIV_LIKELY
  		    (srv_force_recovery < SRV_FORCE_NO_IBUF_MERGE
  		     || (srv_force_recovery < SRV_FORCE_NO_LOG_REDO
-@@ -5454,4 +5460,42 @@
+@@ -5460,4 +5466,42 @@
  		rw_lock_free(&dict_table_stats_latches[i]);
  	}
  }

=== modified file 'innodb_separate_doublewrite.patch'
--- innodb_separate_doublewrite.patch	2011-05-10 07:31:20 +0000
+++ innodb_separate_doublewrite.patch	2011-06-06 03:20:54 +0000
@@ -529,7 +529,7 @@
 diff -ruN a/storage/innodb_plugin/row/row0mysql.c b/storage/innodb_plugin/row/row0mysql.c
 --- a/storage/innodb_plugin/row/row0mysql.c	2010-08-27 16:22:04.287058274 +0900
 +++ b/storage/innodb_plugin/row/row0mysql.c	2010-08-27 16:37:55.410993060 +0900
-@@ -3391,7 +3391,7 @@
+@@ -3401,7 +3401,7 @@
  		/* Do not drop possible .ibd tablespace if something went
  		wrong: we do not want to delete valuable data of the user */
  

=== modified file 'innodb_stats.patch'
--- innodb_stats.patch	2011-05-23 03:13:45 +0000
+++ innodb_stats.patch	2011-06-06 03:20:54 +0000
@@ -359,7 +359,7 @@
  	}
  
  	return(table);
-@@ -4282,6 +4282,307 @@
+@@ -4282,6 +4282,313 @@
  }
  
  /*********************************************************************//**
@@ -604,6 +604,8 @@
 +			break;
 +		}
 +
++		btr_pcur_store_position(&pcur, &mtr);
++
 +		if (rec_get_deleted_flag(rec, 0)) {
 +			/* don't count */
 +			i--;
@@ -644,6 +646,10 @@
 +		rests--;
 +
 +next_rec:
++		mtr_commit(&mtr);
++		mtr_start(&mtr);
++		btr_pcur_restore_position(BTR_MODIFY_LEAF, &pcur, &mtr);
++
 +		btr_pcur_move_to_next_user_rec(&pcur, &mtr);
 +	}
 +	btr_pcur_close(&pcur);
@@ -667,7 +673,7 @@
  Calculates new estimates for table and index statistics. The statistics
  are used in query optimization. */
  UNIV_INTERN
-@@ -4289,10 +4590,11 @@
+@@ -4289,10 +4596,11 @@
  dict_update_statistics(
  /*===================*/
  	dict_table_t*	table,		/*!< in/out: table */
@@ -680,7 +686,7 @@
  {
  	dict_index_t*	index;
  	ulint		sum_of_index_sizes	= 0;
-@@ -4309,6 +4611,27 @@
+@@ -4309,6 +4617,27 @@
  		return;
  	}
  
@@ -708,7 +714,7 @@
  	/* Find out the sizes of the indexes and how many different values
  	for the key they approximately have */
  
-@@ -4373,6 +4696,11 @@
+@@ -4373,6 +4702,11 @@
  		index = dict_table_get_next_index(index);
  	} while (index);
  
@@ -720,7 +726,7 @@
  	index = dict_table_get_first_index(table);
  
  	table->stat_n_rows = index->stat_n_diff_key_vals[
-@@ -4390,6 +4718,78 @@
+@@ -4390,6 +4724,78 @@
  	dict_table_stats_unlock(table, RW_X_LATCH);
  }
  
@@ -799,7 +805,7 @@
  /**********************************************************************//**
  Prints info of a foreign key constraint. */
  static
-@@ -4467,7 +4867,7 @@
+@@ -4467,7 +4873,7 @@
  
  	ut_ad(mutex_own(&(dict_sys->mutex)));
  
@@ -1710,7 +1716,7 @@
  Scans a table create SQL string and adds to the data dictionary
  the foreign key constraints declared in the string. This function
  should be called after the indexes for a table have been created.
-@@ -2966,7 +3034,7 @@
+@@ -2976,7 +3044,7 @@
  	dict_table_autoinc_initialize(table, 1);
  	dict_table_autoinc_unlock(table);
  	dict_update_statistics(table, FALSE /* update even if stats are
@@ -1719,7 +1725,7 @@
  
  	trx_commit_for_mysql(trx);
  
-@@ -3268,6 +3336,8 @@
+@@ -3278,6 +3346,8 @@
  			   "       IF (SQL % NOTFOUND) THEN\n"
  			   "               found := 0;\n"
  			   "       ELSE\n"