← 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_expand_import.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_expand_import.patch
500
500
diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
501
501
--- a/storage/innobase/handler/ha_innodb.cc     2010-12-03 15:49:59.195023983 +0900
502
502
+++ b/storage/innobase/handler/ha_innodb.cc     2010-12-03 15:52:23.555957062 +0900
503
 
@@ -7356,6 +7356,14 @@
 
503
@@ -7368,6 +7368,14 @@
504
504
                err = row_discard_tablespace_for_mysql(dict_table->name, trx);
505
505
        } else {
506
506
                err = row_import_tablespace_for_mysql(dict_table->name, trx);
515
515
        }
516
516
 
517
517
        err = convert_error_code_to_mysql(err, dict_table->flags, NULL);
518
 
@@ -11625,6 +11633,11 @@
 
518
@@ -11642,6 +11650,11 @@
519
519
   "Choose method of innodb_adaptive_flushing. (native, [estimate], keep_average)",
520
520
   NULL, innodb_adaptive_flushing_method_update, 1, &adaptive_flushing_method_typelib);
521
521
 
527
527
 static MYSQL_SYSVAR_ULONG(dict_size_limit, srv_dict_size_limit,
528
528
   PLUGIN_VAR_RQCMDARG,
529
529
   "Limit the allocated memory for dictionary cache. (0: unlimited)",
530
 
@@ -11697,6 +11710,7 @@
 
530
@@ -11714,6 +11727,7 @@
531
531
   MYSQL_SYSVAR(flush_neighbor_pages),
532
532
   MYSQL_SYSVAR(read_ahead),
533
533
   MYSQL_SYSVAR(adaptive_flushing_method),
550
550
diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
551
551
--- a/storage/innobase/srv/srv0srv.c    2010-12-03 15:49:59.230956118 +0900
552
552
+++ b/storage/innobase/srv/srv0srv.c    2010-12-03 15:52:23.562954411 +0900
553
 
@@ -423,6 +423,8 @@
 
553
@@ -422,6 +422,8 @@
554
554
 UNIV_INTERN ulint      srv_read_ahead = 3; /* 1: random  2: linear  3: Both */
555
555
 UNIV_INTERN ulint      srv_adaptive_flushing_method = 0; /* 0: native  1: estimate  2: keep_average */
556
556