← Back to branch summary

~tsarev/percona-server/5.5-processlist_rows_stats-sporadic_fails-fix

« back to all changes in this revision

Viewing changes to innodb_files_extend.patch

  • Committer: kinoyasu
  • Date: 2011-05-10 11:57:42 UTC
  • Revision ID: kinoyasu@gauntlet4-20110510115742-3i3194rn2m8fipm2
port Yasufumi patches to 5.5.12

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_files_extend.patch
121
121
 static my_bool innobase_thread_concurrency_timer_based;
122
122
 static long long innobase_buffer_pool_size, innobase_log_file_size;
123
123
 
124
 
@@ -2289,6 +2292,65 @@
 
124
@@ -2302,6 +2305,65 @@
125
125
        }
126
126
 #endif /* DBUG_OFF */
127
127
 
187
187
 #ifndef MYSQL_SERVER
188
188
        innodb_overwrite_relay_log_info = FALSE;
189
189
 #endif
190
 
@@ -7241,9 +7303,9 @@
 
190
@@ -7253,9 +7315,9 @@
191
191
                                | DICT_TF_COMPACT
192
192
                                | DICT_TF_FORMAT_ZIP
193
193
                                << DICT_TF_FORMAT_SHIFT;
200
200
                }
201
201
        }
202
202
 
203
 
@@ -11412,6 +11474,16 @@
 
203
@@ -11425,6 +11487,16 @@
204
204
   "#### Attention: The checksum is not compatible for normal or disabled version! ####",
205
205
   NULL, NULL, FALSE);
206
206
 
217
217
 static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
218
218
   PLUGIN_VAR_READONLY,
219
219
   "The common part for InnoDB table spaces.",
220
 
@@ -11915,6 +11987,8 @@
 
220
@@ -11928,6 +12000,8 @@
221
221
   NULL, NULL, 0, &corrupt_table_action_typelib);
222
222
 
223
223
 static struct st_mysql_sys_var* innobase_system_variables[]= {
229
229
diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
230
230
--- a/storage/innobase/include/buf0buf.h        2010-12-04 15:55:21.375482937 +0900
231
231
+++ b/storage/innobase/include/buf0buf.h        2010-12-04 15:55:58.258469088 +0900
232
 
@@ -1682,7 +1682,7 @@
 
232
@@ -1684,7 +1684,7 @@
233
233
        time_t          last_printout_time;
234
234
                                        /*!< when buf_print_io was last time
235
235
                                        called */
238
238
                                        /*!< Statistics of buddy system,
239
239
                                        indexed by block size */
240
240
        buf_pool_stat_t stat;           /*!< current statistics */
241
 
@@ -1778,7 +1778,7 @@
 
241
@@ -1780,7 +1780,7 @@
242
242
        /* @{ */
243
243
        UT_LIST_BASE_NODE_T(buf_page_t) zip_clean;
244
244
                                        /*!< unmodified compressed pages */
247
247
                                        /*!< buddy free lists */
248
248
 
249
249
        buf_page_t                      watch[BUF_POOL_WATCH_SIZE];
250
 
@@ -1786,9 +1786,9 @@
 
250
@@ -1788,9 +1788,9 @@
251
251
                                        pool watches. Protected by
252
252
                                        buf_pool->mutex. */
253
253
 
547
547
diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
548
548
--- a/storage/innobase/srv/srv0srv.c    2010-12-04 15:55:21.384486344 +0900
549
549
+++ b/storage/innobase/srv/srv0srv.c    2010-12-04 15:55:58.282550845 +0900
550
 
@@ -241,6 +241,13 @@
 
550
@@ -240,6 +240,13 @@
551
551
 UNIV_INTERN ulint      srv_n_read_io_threads   = ULINT_MAX;
552
552
 UNIV_INTERN ulint      srv_n_write_io_threads  = ULINT_MAX;
553
553
 
564
564
diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
565
565
--- a/storage/innobase/srv/srv0start.c  2010-12-04 15:52:23.502513556 +0900
566
566
+++ b/storage/innobase/srv/srv0start.c  2010-12-04 15:55:58.285550583 +0900
567
 
@@ -1562,11 +1562,13 @@
 
567
@@ -1561,11 +1561,13 @@
568
568
        }
569
569
 #endif /* UNIV_LOG_ARCHIVE */
570
570
 
580
580
 
581
581
                return(DB_ERROR);
582
582
        }
583
 
@@ -1575,7 +1577,7 @@
 
583
@@ -1574,7 +1576,7 @@
584
584
 
585
585
        for (i = 0; i < srv_n_data_files; i++) {
586
586
 #ifndef __WIN__