1
=== modified file 'innodb_recovery_patches.patch'
2
--- innodb_recovery_patches.patch	2010-03-26 10:01:13 +0000
3
+++ innodb_recovery_patches.patch	2010-06-07 08:35:32 +0000
4
@@ -80,7 +80,58 @@
5
80
 
80
 
6
81
 		return(0);
81
 		return(0);
7
82
 	}
82
 	}
9
83
@@ -620,11 +660,11 @@
83
@@ -606,6 +646,50 @@
10
84
 		/* It is a single table tablespace and the .ibd file is
11
85
 		missing: do nothing */
12
86
 
13
87
+		/* the log records should be treated here same reason
14
88
+		for http://bugs.mysql.com/bug.php?id=43948 */
15
89
+
16
90
+		if (recv_recovery_is_on()) {
17
91
+			recv_addr_t*    recv_addr;
18
92
+
19
93
+			mutex_enter(&(recv_sys->mutex));
20
94
+
21
95
+			if (recv_sys->apply_log_recs == FALSE) {
22
96
+				mutex_exit(&(recv_sys->mutex));
23
97
+				goto not_to_recover;
24
98
+			}
25
99
+
26
100
+			for (i = 0; i < n_stored; i++) {
27
101
+				/* recv_get_fil_addr_struct() */
28
102
+				recv_addr = HASH_GET_FIRST(recv_sys->addr_hash,
29
103
+						hash_calc_hash(ut_fold_ulint_pair(space, page_nos[i]),
30
104
+							recv_sys->addr_hash));
31
105
+				while (recv_addr) {
32
106
+					if ((recv_addr->space == space)
33
107
+						&& (recv_addr->page_no == page_nos[i])) {
34
108
+						break;
35
109
+					}
36
110
+					recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
37
111
+				}
38
112
+
39
113
+				if ((recv_addr == NULL)
40
114
+				    || (recv_addr->state == RECV_BEING_PROCESSED)
41
115
+				    || (recv_addr->state == RECV_PROCESSED)) {
42
116
+					continue;
43
117
+				}
44
118
+
45
119
+				recv_addr->state = RECV_PROCESSED;
46
120
+
47
121
+				ut_a(recv_sys->n_addrs);
48
122
+				recv_sys->n_addrs--;
49
123
+			}
50
124
+
51
125
+			mutex_exit(&(recv_sys->mutex));
52
126
+
53
127
+			fprintf(stderr, " (cannot find space: %lu)", space);
54
128
+		}
55
129
+not_to_recover:
56
130
+
57
131
 		return;
58
132
 	}
59
133
 
60
134
@@ -620,11 +704,11 @@
61
84
 		while (buf_pool->n_pend_reads >= recv_n_pool_free_frames / 2) {
135
 		while (buf_pool->n_pend_reads >= recv_n_pool_free_frames / 2) {
62
85
 
136
 
63
86
 			os_aio_simulated_wake_handler_threads();
137
 			os_aio_simulated_wake_handler_threads();
Reviewer	Review Type	Date Requested	Status
Vadim Tkachenko		2010-06-07	Approve on 2010-06-07
Review via email: mp+26908@code.launchpad.net