← Back to branch summary

~percona-dev/percona-server/release-5.5.11-20.2-fix-bug-764138

« back to all changes in this revision

Viewing changes to innodb_expand_import.patch

  • Committer: Ignacio Nin
  • Date: 2011-03-27 18:30:06 UTC
  • mfrom: (88.2.3 5.5.10)
  • Revision ID: ignacio.nin@percona.com-20110327183006-ij0o2pdyhzaerish
Merge 5.5.10 changes

Merge 5.5.10 changes to release-5.5.9-20.1 in order to create release-5.5.10-20.1

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
 
@@ -7337,6 +7337,14 @@
 
503
@@ -7356,6 +7356,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
 
@@ -11538,6 +11546,11 @@
 
518
@@ -11618,6 +11626,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(extra_rsegments, srv_extra_rsegments,
528
528
   PLUGIN_VAR_RQCMDARG,
529
529
   "Number of extra user rollback segments which are used in a round-robin fashion.",
530
 
@@ -11614,6 +11627,7 @@
 
530
@@ -11695,6 +11708,7 @@
531
531
   MYSQL_SYSVAR(flush_neighbor_pages),
532
532
   MYSQL_SYSVAR(read_ahead),
533
533
   MYSQL_SYSVAR(adaptive_flushing_method),
538
538
diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
539
539
--- a/storage/innobase/include/srv0srv.h        2010-12-03 15:48:03.077954270 +0900
540
540
+++ b/storage/innobase/include/srv0srv.h        2010-12-03 15:52:23.561986996 +0900
541
 
@@ -227,6 +227,8 @@
 
541
@@ -232,6 +232,8 @@
542
542
 extern ulint   srv_read_ahead;
543
543
 extern ulint   srv_adaptive_flushing_method;
544
544
 
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
 
@@ -415,6 +415,8 @@
 
553
@@ -420,6 +420,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