← Back to branch summary

~percona-dev/percona-server/release-5.1.57-12.8-commit108486

« back to all changes in this revision

Viewing changes to innodb_expand_import.patch

  • Committer: kinoyasu
  • Date: 2010-06-18 10:43:10 UTC
  • Revision ID: kinoyasu@gauntlet4-20100618104310-16tw73nfzl8rvkay
port for mysql-5.1.48

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_expand_import.patch
12
12
 #ifndef UNIV_HOTBACKUP
13
13
 # include "buf0lru.h"
14
14
 # include "ibuf0ibuf.h"
15
 
@@ -2982,7 +2986,7 @@
 
15
@@ -2983,7 +2987,7 @@
16
16
        ut_a(!(flags & (~0UL << DICT_TF_BITS)));
17
17
 
18
18
        file = os_file_create_simple_no_error_handling(
21
21
        if (!success) {
22
22
                /* The following call prints an error message */
23
23
                os_file_get_last_error(TRUE);
24
 
@@ -3029,6 +3033,330 @@
 
24
@@ -3030,6 +3034,330 @@
25
25
        space_id = fsp_header_get_space_id(page);
26
26
        space_flags = fsp_header_get_flags(page);
27
27
 
355
355
diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
356
356
--- a/storage/innodb_plugin/handler/ha_innodb.cc        2010-04-29 16:54:08.000000000 +0900
357
357
+++ b/storage/innodb_plugin/handler/ha_innodb.cc        2010-04-30 10:28:05.000000000 +0900
358
 
@@ -11074,6 +11074,11 @@
 
358
@@ -11217,6 +11217,11 @@
359
359
   "Enable/Disable unsafe group commit when support_xa=OFF and use with binlog or other XA storage engine.",
360
360
   NULL, NULL, 0, 0, 1, 0);
361
361
 
367
367
 static MYSQL_SYSVAR_ULONG(extra_rsegments, srv_extra_rsegments,
368
368
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
369
369
   "Number of extra user rollback segments when create new database.",
370
 
@@ -11149,6 +11154,7 @@
 
370
@@ -11292,6 +11297,7 @@
371
371
   MYSQL_SYSVAR(read_ahead),
372
372
   MYSQL_SYSVAR(adaptive_checkpoint),
373
373
   MYSQL_SYSVAR(enable_unsafe_group_commit),