← Back to branch summary

~percona-dev/percona-server/5.1.57-fix_bug_785564

« back to all changes in this revision

Viewing changes to innodb_extend_slow.patch

  • Committer: kinoyasu
  • Date: 2011-05-10 07:31:20 UTC
  • Revision ID: kinoyasu@gauntlet4-20110510073120-j9sqr0px5ltnyy8b
port Yasufumi patches to 5.1.57

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_extend_slow.patch
104
104
        }
105
105
 
106
106
 #ifdef UNIV_IBUF_COUNT_DEBUG
107
 
@@ -2093,6 +2148,11 @@
 
107
@@ -2096,6 +2151,11 @@
108
108
        ibool           must_read;
109
109
        ulint           retries = 0;
110
110
        mutex_t*        block_mutex;
116
116
 
117
117
        ut_ad(mtr);
118
118
        ut_ad(mtr->state == MTR_ACTIVE);
119
 
@@ -2107,6 +2167,9 @@
 
119
@@ -2120,6 +2180,9 @@
120
120
 #ifndef UNIV_LOG_DEBUG
121
121
        ut_ad(!ibuf_inside() || ibuf_page(space, zip_size, offset, NULL));
122
122
 #endif
126
126
        buf_pool->stat.n_page_gets++;
127
127
 loop:
128
128
        block = guess;
129
 
@@ -2160,7 +2223,7 @@
 
129
@@ -2174,7 +2237,7 @@
130
130
                        return(NULL);
131
131
                }
132
132
 
135
135
                        retries = 0;
136
136
                } else if (retries < BUF_PAGE_READ_MAX_RETRIES) {
137
137
                        ++retries;
138
 
@@ -2444,6 +2507,13 @@
 
138
@@ -2462,6 +2525,13 @@
139
139
                        /* Let us wait until the read operation
140
140
                        completes */
141
141
 
149
149
                        for (;;) {
150
150
                                enum buf_io_fix io_fix;
151
151
 
152
 
@@ -2458,6 +2528,12 @@
 
152
@@ -2476,6 +2546,12 @@
153
153
                                        break;
154
154
                                }
155
155
                        }
162
162
                }
163
163
 
164
164
                fix_type = MTR_MEMO_BUF_FIX;
165
 
@@ -2483,13 +2559,17 @@
 
165
@@ -2501,13 +2577,17 @@
166
166
                /* In the case of a first access, try to apply linear
167
167
                read-ahead */
168
168
 
181
181
        return(block);
182
182
 }
183
183
 
184
 
@@ -2512,6 +2592,7 @@
 
184
@@ -2530,6 +2610,7 @@
185
185
        unsigned        access_time;
186
186
        ibool           success;
187
187
        ulint           fix_type;
189
189
 
190
190
        ut_ad(block);
191
191
        ut_ad(mtr);
192
 
@@ -2589,13 +2670,17 @@
 
192
@@ -2607,13 +2688,17 @@
193
193
 #if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG
194
194
        ut_a(block->page.file_page_was_freed == FALSE);
195
195
 #endif
208
208
        }
209
209
 
210
210
 #ifdef UNIV_IBUF_COUNT_DEBUG
211
 
@@ -2604,6 +2689,9 @@
 
211
@@ -2622,6 +2707,9 @@
212
212
 #endif
213
213
        buf_pool->stat.n_page_gets++;
214
214
 
218
218
        return(TRUE);
219
219
 }
220
220
 
221
 
@@ -2625,6 +2713,7 @@
 
221
@@ -2643,6 +2731,7 @@
222
222
 {
223
223
        ibool           success;
224
224
        ulint           fix_type;
226
226
 
227
227
        ut_ad(mtr);
228
228
        ut_ad(mtr->state == MTR_ACTIVE);
229
 
@@ -2709,6 +2798,11 @@
 
229
@@ -2727,6 +2816,11 @@
230
230
 #endif
231
231
        buf_pool->stat.n_page_gets++;
232
232