Merge lp:~percona-dev/percona-server/release-5.1.47-11-fix-bug589639 into lp:percona-server/release-5.1.47-11

[Yasufumi Kinoshita]

[Vadim Tkachenko (vadim-tk)]

review: Approve

=== modified file 'innodb_extend_slow.patch'
--- innodb_extend_slow.patch	2010-05-26 10:15:29 +0000
+++ innodb_extend_slow.patch	2010-06-07 09:06:23 +0000
@@ -312,7 +312,7 @@
  
  		if (UNIV_UNLIKELY(err == DB_TABLESPACE_DELETED)) {
  tablespace_deleted:
-@@ -684,12 +687,12 @@
+@@ -728,12 +731,12 @@
  		if ((i + 1 == n_stored) && sync) {
  			buf_read_page_low(&err, TRUE, BUF_READ_ANY_PAGE, space,
  					  zip_size, TRUE, tablespace_version,

=== modified file 'innodb_recovery_patches.patch'
--- innodb_recovery_patches.patch	2010-05-26 10:15:29 +0000
+++ innodb_recovery_patches.patch	2010-06-07 09:06:23 +0000
@@ -48,6 +48,57 @@
  
  		return(0);
  	}
+@@ -606,6 +646,50 @@
+ 		/* It is a single table tablespace and the .ibd file is
+ 		missing: do nothing */
+ 
++		/* the log records should be treated here same reason
++		for http://bugs.mysql.com/bug.php?id=43948 */
++
++		if (recv_recovery_is_on()) {
++			recv_addr_t*    recv_addr;
++
++			mutex_enter(&(recv_sys->mutex));
++
++			if (recv_sys->apply_log_recs == FALSE) {
++				mutex_exit(&(recv_sys->mutex));
++				goto not_to_recover;
++			}
++
++			for (i = 0; i < n_stored; i++) {
++				/* recv_get_fil_addr_struct() */
++				recv_addr = HASH_GET_FIRST(recv_sys->addr_hash,
++						hash_calc_hash(ut_fold_ulint_pair(space, page_nos[i]),
++							recv_sys->addr_hash));
++				while (recv_addr) {
++					if ((recv_addr->space == space)
++						&& (recv_addr->page_no == page_nos[i])) {
++						break;
++					}
++					recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
++				}
++
++				if ((recv_addr == NULL)
++				    || (recv_addr->state == RECV_BEING_PROCESSED)
++				    || (recv_addr->state == RECV_PROCESSED)) {
++					continue;
++				}
++
++				recv_addr->state = RECV_PROCESSED;
++
++				ut_a(recv_sys->n_addrs);
++				recv_sys->n_addrs--;
++			}
++
++			mutex_exit(&(recv_sys->mutex));
++
++			fprintf(stderr, " (cannot find space: %lu)", space);
++		}
++not_to_recover:
++
+ 		return;
+ 	}
+ 
 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
 --- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-30 10:49:58.000000000 +0900
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-30 13:53:47.000000000 +0900