← Back to branch summary

~akopytov/percona-server/bug797944

« back to all changes in this revision

Viewing changes to innodb_dict_size_limit.patch

  • Committer: Oleg Tsarev
  • Date: 2011-06-15 21:57:04 UTC
  • mfrom: (170.1.2 rnt_rebase)
  • Revision ID: oleg.tsarev@percona.com-20110615215704-57l80gh5t12m93j5
port to 5.1.57 (merge with lp:percona-server/5.1)

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_dict_size_limit.patch
245
245
diff -ruN a/storage/innodb_plugin/dict/dict0dict.c b/storage/innodb_plugin/dict/dict0dict.c
246
246
--- a/storage/innodb_plugin/dict/dict0dict.c    2010-08-04 02:24:19.000000000 +0900
247
247
+++ b/storage/innodb_plugin/dict/dict0dict.c    2010-08-27 16:09:42.930057360 +0900
248
 
@@ -582,6 +582,8 @@
 
248
@@ -613,6 +613,8 @@
249
249
 
250
250
        table = dict_table_get_on_id_low(table_id);
251
251
 
254
254
        mutex_exit(&(dict_sys->mutex));
255
255
 
256
256
        return(table);
257
 
@@ -697,6 +699,8 @@
 
257
@@ -728,6 +730,8 @@
258
258
                table->n_mysql_handles_opened++;
259
259
        }
260
260
 
263
263
        mutex_exit(&(dict_sys->mutex));
264
264
 
265
265
        if (table != NULL) {
266
 
@@ -1211,6 +1215,64 @@
 
266
@@ -1241,6 +1245,64 @@
267
267
        dict_mem_table_free(table);
268
268
 }
269
269
 
328
328
 /****************************************************************//**
329
329
 If the given column name is reserved for InnoDB system columns, return
330
330
 TRUE.
331
 
@@ -1673,6 +1735,11 @@
 
331
@@ -1709,6 +1771,11 @@
332
332
        ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
333
333
        ut_ad(mutex_own(&(dict_sys->mutex)));
334
334
 
343
343
diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
344
344
--- a/storage/innodb_plugin/handler/ha_innodb.cc        2010-08-27 16:09:22.832057795 +0900
345
345
+++ b/storage/innodb_plugin/handler/ha_innodb.cc        2010-08-27 16:09:42.939059876 +0900
346
 
@@ -541,6 +541,8 @@
 
346
@@ -560,6 +560,8 @@
347
347
   (char*) &export_vars.innodb_dblwr_pages_written,       SHOW_LONG},
348
348
   {"dblwr_writes",
349
349
   (char*) &export_vars.innodb_dblwr_writes,              SHOW_LONG},
352
352
   {"have_atomic_builtins",
353
353
   (char*) &export_vars.innodb_have_atomic_builtins,      SHOW_BOOL},
354
354
   {"log_waits",
355
 
@@ -11283,6 +11285,11 @@
 
355
@@ -11390,6 +11392,11 @@
356
356
   "Number of extra user rollback segments when create new database.",
357
357
   NULL, NULL, 0, 0, 126, 0);
358
358
 
364
364
 static struct st_mysql_sys_var* innobase_system_variables[]= {
365
365
   MYSQL_SYSVAR(additional_mem_pool_size),
366
366
   MYSQL_SYSVAR(autoextend_increment),
367
 
@@ -11350,6 +11357,7 @@
 
367
@@ -11458,6 +11465,7 @@
368
368
   MYSQL_SYSVAR(flush_log_at_trx_commit_session),
369
369
   MYSQL_SYSVAR(enable_unsafe_group_commit),
370
370
   MYSQL_SYSVAR(extra_rsegments),
371
371
+  MYSQL_SYSVAR(dict_size_limit),
372
372
   MYSQL_SYSVAR(use_sys_malloc),
373
373
   MYSQL_SYSVAR(change_buffering),
374
 
   MYSQL_SYSVAR(read_ahead_threshold),
 
374
 #if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
375
375
diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
376
376
--- a/storage/innodb_plugin/handler/innodb_patch_info.h 2010-08-27 16:09:22.832057795 +0900
377
377
+++ b/storage/innodb_plugin/handler/innodb_patch_info.h 2010-08-27 16:09:42.944058939 +0900
385
385
diff -ruN a/storage/innodb_plugin/ibuf/ibuf0ibuf.c b/storage/innodb_plugin/ibuf/ibuf0ibuf.c
386
386
--- a/storage/innodb_plugin/ibuf/ibuf0ibuf.c    2010-08-27 15:54:18.077987587 +0900
387
387
+++ b/storage/innodb_plugin/ibuf/ibuf0ibuf.c    2010-08-27 16:09:42.949020590 +0900
388
 
@@ -508,6 +508,7 @@
 
388
@@ -514,6 +514,7 @@
389
389
 
390
390
        /* Use old-style record format for the insert buffer. */
391
391
        table = dict_mem_table_create(IBUF_TABLE_NAME, IBUF_SPACE_ID, 1, 0);
413
413
diff -ruN a/storage/innodb_plugin/include/dict0dict.h b/storage/innodb_plugin/include/dict0dict.h
414
414
--- a/storage/innodb_plugin/include/dict0dict.h 2010-08-04 02:24:19.000000000 +0900
415
415
+++ b/storage/innodb_plugin/include/dict0dict.h 2010-08-27 16:09:42.953188223 +0900
416
 
@@ -1132,6 +1132,12 @@
 
416
@@ -1131,6 +1131,12 @@
417
417
 /*====================================*/
418
418
        dict_table_t*   table,  /*!< in: table */
419
419
        const char*     name);  /*!< in: name of the index to find */
459
459
diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
460
460
--- a/storage/innodb_plugin/include/srv0srv.h   2010-08-27 16:09:22.833022367 +0900
461
461
+++ b/storage/innodb_plugin/include/srv0srv.h   2010-08-27 16:09:42.957104575 +0900
462
 
@@ -214,7 +214,7 @@
 
462
@@ -219,7 +219,7 @@
463
463
 extern ulint   srv_adaptive_checkpoint;
464
464
 
465
465
 extern ulint   srv_extra_rsegments;
468
468
 /*-------------------------------------------*/
469
469
 
470
470
 extern ulint   srv_n_rows_inserted;
471
 
@@ -607,6 +607,7 @@
 
471
@@ -625,6 +625,7 @@
472
472
        ulint innodb_data_writes;               /*!< I/O write requests */
473
473
        ulint innodb_data_written;              /*!< Data bytes written */
474
474
        ulint innodb_data_reads;                /*!< I/O read requests */
479
479
diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
480
480
--- a/storage/innodb_plugin/srv/srv0srv.c       2010-08-27 16:09:22.834056830 +0900
481
481
+++ b/storage/innodb_plugin/srv/srv0srv.c       2010-08-27 16:09:42.960059093 +0900
482
 
@@ -386,6 +386,7 @@
 
482
@@ -391,6 +391,7 @@
483
483
 UNIV_INTERN ulint      srv_adaptive_checkpoint = 0; /* 0: none  1: reflex  2: estimate */
484
484
 
485
485
 UNIV_INTERN ulint      srv_extra_rsegments = 0; /* extra rseg for users */
487
487
 /*-------------------------------------------*/
488
488
 UNIV_INTERN ulong      srv_n_spin_wait_rounds  = 30;
489
489
 UNIV_INTERN ulong      srv_n_free_tickets_to_enter = 500;
490
 
@@ -2086,6 +2087,7 @@
 
490
@@ -2091,6 +2092,7 @@
491
491
        export_vars.innodb_data_reads = os_n_file_reads;
492
492
        export_vars.innodb_data_writes = os_n_file_writes;
493
493
        export_vars.innodb_data_written = srv_data_written;