← Back to branch summary

~longbow/percona-server/test_730173_5.5

« back to all changes in this revision

Viewing changes to patches/innodb_files_extend.patch

  • Committer: Stewart Smith
  • Date: 2011-11-17 00:21:45 UTC
  • mfrom: (190.2.9 merge)
  • Revision ID: stewart@flamingspork.com-20111117002145-6180fuj12147yk9i
merge 5.5.17 port

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/innodb_files_extend.patch
109
109
 static my_bool innobase_thread_concurrency_timer_based;
110
110
 static long long innobase_buffer_pool_size, innobase_log_file_size;
111
111
 
112
 
@@ -2325,6 +2328,65 @@
 
112
@@ -2352,6 +2355,65 @@
113
113
        }
114
114
 #endif /* DBUG_OFF */
115
115
 
175
175
 #ifndef MYSQL_SERVER
176
176
        innodb_overwrite_relay_log_info = FALSE;
177
177
 #endif
178
 
@@ -7239,9 +7301,9 @@
 
178
@@ -7291,9 +7353,9 @@
179
179
                                | DICT_TF_COMPACT
180
180
                                | DICT_TF_FORMAT_ZIP
181
181
                                << DICT_TF_FORMAT_SHIFT;
188
188
                }
189
189
        }
190
190
 
191
 
@@ -11437,6 +11499,16 @@
 
191
@@ -11544,6 +11606,16 @@
192
192
   "#### Attention: The checksum is not compatible for normal or disabled version! ####",
193
193
   NULL, NULL, FALSE);
194
194
 
205
205
 static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
206
206
   PLUGIN_VAR_READONLY,
207
207
   "The common part for InnoDB table spaces.",
208
 
@@ -11958,6 +12030,8 @@
 
208
@@ -12070,6 +12142,8 @@
209
209
   NULL, NULL, 0, &corrupt_table_action_typelib);
210
210
 
211
211
 static struct st_mysql_sys_var* innobase_system_variables[]= {
216
216
   MYSQL_SYSVAR(buffer_pool_size),
217
217
--- a/storage/innobase/include/buf0buf.h
218
218
+++ b/storage/innobase/include/buf0buf.h
219
 
@@ -1740,7 +1740,7 @@
 
219
@@ -1715,7 +1715,7 @@
220
220
        time_t          last_printout_time;
221
221
                                        /*!< when buf_print_io was last time
222
222
                                        called */
225
225
                                        /*!< Statistics of buddy system,
226
226
                                        indexed by block size */
227
227
        buf_pool_stat_t stat;           /*!< current statistics */
228
 
@@ -1838,7 +1838,7 @@
 
228
@@ -1813,7 +1813,7 @@
229
229
        UT_LIST_BASE_NODE_T(buf_page_t) zip_clean;
230
230
                                        /*!< unmodified compressed pages */
231
231
 #endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */
234
234
                                        /*!< buddy free lists */
235
235
 
236
236
        buf_page_t                      watch[BUF_POOL_WATCH_SIZE];
237
 
@@ -1846,9 +1846,9 @@
 
237
@@ -1821,9 +1821,9 @@
238
238
                                        pool watches. Protected by
239
239
                                        buf_pool->mutex. */
240
240
 
358
358
 #define TRX_SYS_MYSQL_MASTER_LOG_INFO  (UNIV_PAGE_SIZE - 2000)
359
359
--- a/storage/innobase/include/univ.i
360
360
+++ b/storage/innobase/include/univ.i
361
 
@@ -310,9 +310,13 @@
 
361
@@ -313,9 +313,13 @@
362
362
 */
363
363
 
364
364
 /* The 2-logarithm of UNIV_PAGE_SIZE: */
374
374
 
375
375
 /* Maximum number of parallel threads in a parallelized operation */
376
376
 #define UNIV_MAX_PARALLELISM   32
377
 
@@ -431,7 +435,7 @@
 
377
@@ -434,7 +438,7 @@
378
378
 stored part of the field in the tablespace. The length field then
379
379
 contains the sum of the following flag and the locally stored len. */
380
380
 
383
383
 
384
384
 /* Some macros to improve branch prediction and reduce cache misses */
385
385
 #if defined(__GNUC__) && (__GNUC__ > 2) && ! defined(__INTEL_COMPILER)
386
 
@@ -534,4 +538,6 @@
 
386
@@ -537,4 +541,6 @@
387
387
        UNIV_MEM_ALLOC(addr, size);                     \
388
388
 } while (0)
389
389