← Back to branch summary

~vlad-lesin/percona-server/pintables

« back to all changes in this revision

Viewing changes to innodb_dict_size_limit.patch

  • Committer: Laurynas Biveinis
  • Date: 2011-06-21 02:36:36 UTC
  • mfrom: (123 merge)
  • mto: This revision was merged to the branch mainline in revision 124.
  • Revision ID: laurynas.biveinis@percona.com-20110621023636-ccp1iyyrncj181zt
Merge from lp:percona-server

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_dict_size_limit.patch
277
277
diff -ruN a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c
278
278
--- a/storage/innobase/dict/dict0dict.c 2010-11-03 07:01:13.000000000 +0900
279
279
+++ b/storage/innobase/dict/dict0dict.c 2010-12-03 15:45:47.525953769 +0900
280
 
@@ -627,6 +627,8 @@
 
280
@@ -626,6 +626,8 @@
281
281
 
282
282
        table = dict_table_get_on_id_low(table_id);
283
283
 
286
286
        mutex_exit(&(dict_sys->mutex));
287
287
 
288
288
        return(table);
289
 
@@ -745,6 +747,8 @@
 
289
@@ -744,6 +746,8 @@
290
290
                table->n_mysql_handles_opened++;
291
291
        }
292
292
 
295
295
        mutex_exit(&(dict_sys->mutex));
296
296
 
297
297
        if (table != NULL) {
298
 
@@ -1260,6 +1264,64 @@
 
298
@@ -1259,6 +1263,64 @@
299
299
        dict_mem_table_free(table);
300
300
 }
301
301
 
360
360
 /****************************************************************//**
361
361
 If the given column name is reserved for InnoDB system columns, return
362
362
 TRUE.
363
 
@@ -1729,6 +1791,11 @@
 
363
@@ -1728,6 +1790,11 @@
364
364
        ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
365
365
        ut_ad(mutex_own(&(dict_sys->mutex)));
366
366
 
384
384
   {"have_atomic_builtins",
385
385
   (char*) &export_vars.innodb_have_atomic_builtins,      SHOW_BOOL},
386
386
   {"log_waits",
387
 
@@ -11635,6 +11637,11 @@
 
387
@@ -11642,6 +11644,11 @@
388
388
   "Choose method of innodb_adaptive_flushing. (native, [estimate], keep_average)",
389
389
   NULL, innodb_adaptive_flushing_method_update, 1, &adaptive_flushing_method_typelib);
390
390
 
396
396
 static struct st_mysql_sys_var* innobase_system_variables[]= {
397
397
   MYSQL_SYSVAR(additional_mem_pool_size),
398
398
   MYSQL_SYSVAR(autoextend_increment),
399
 
@@ -11702,6 +11709,7 @@
 
399
@@ -11709,6 +11716,7 @@
400
400
   MYSQL_SYSVAR(flush_neighbor_pages),
401
401
   MYSQL_SYSVAR(read_ahead),
402
402
   MYSQL_SYSVAR(adaptive_flushing_method),
500
500
diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
501
501
--- a/storage/innobase/include/srv0srv.h        2010-12-03 15:43:57.297067100 +0900
502
502
+++ b/storage/innobase/include/srv0srv.h        2010-12-03 15:45:47.562024404 +0900
503
 
@@ -232,6 +232,7 @@
 
503
@@ -229,6 +229,7 @@
504
504
 extern ulint   srv_read_ahead;
505
505
 extern ulint   srv_adaptive_flushing_method;
506
506
 
508
508
 /*-------------------------------------------*/
509
509
 
510
510
 extern ulint   srv_n_rows_inserted;
511
 
@@ -712,6 +713,7 @@
 
511
@@ -709,6 +710,7 @@
512
512
        ulint innodb_data_writes;               /*!< I/O write requests */
513
513
        ulint innodb_data_written;              /*!< Data bytes written */
514
514
        ulint innodb_data_reads;                /*!< I/O read requests */
519
519
diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
520
520
--- a/storage/innobase/srv/srv0srv.c    2010-12-03 15:43:57.301024390 +0900
521
521
+++ b/storage/innobase/srv/srv0srv.c    2010-12-03 15:45:47.565023830 +0900
522
 
@@ -421,6 +421,8 @@
 
522
@@ -415,6 +415,8 @@
523
523
 UNIV_INTERN ulint      srv_enable_unsafe_group_commit = 0; /* 0:disable 1:enable */
524
524
 UNIV_INTERN ulint      srv_read_ahead = 3; /* 1: random  2: linear  3: Both */
525
525
 UNIV_INTERN ulint      srv_adaptive_flushing_method = 0; /* 0: native  1: estimate  2: keep_average */
528
528
 /*-------------------------------------------*/
529
529
 UNIV_INTERN ulong      srv_n_spin_wait_rounds  = 30;
530
530
 UNIV_INTERN ulong      srv_n_free_tickets_to_enter = 500;
531
 
@@ -2211,6 +2213,7 @@
 
531
@@ -2220,6 +2222,7 @@
532
532
        export_vars.innodb_data_reads = os_n_file_reads;
533
533
        export_vars.innodb_data_writes = os_n_file_writes;
534
534
        export_vars.innodb_data_written = srv_data_written;