← Back to branch summary

~percona-dev/percona-server/5.1.57-fix_bug_785564

« back to all changes in this revision

Viewing changes to innodb_files_extend.patch

  • Committer: kinoyasu
  • Date: 2011-05-10 07:31:20 UTC
  • Revision ID: kinoyasu@gauntlet4-20110510073120-j9sqr0px5ltnyy8b
port Yasufumi patches to 5.1.57

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_files_extend.patch
251
251
diff -ruN a/storage/innodb_plugin/include/buf0buf.h b/storage/innodb_plugin/include/buf0buf.h
252
252
--- a/storage/innodb_plugin/include/buf0buf.h   2010-08-27 16:43:11.959021085 +0900
253
253
+++ b/storage/innodb_plugin/include/buf0buf.h   2010-08-27 16:44:21.691058408 +0900
254
 
@@ -1450,11 +1450,11 @@
 
254
@@ -1452,11 +1452,11 @@
255
255
        /* @{ */
256
256
        UT_LIST_BASE_NODE_T(buf_page_t) zip_clean;
257
257
                                        /*!< unmodified compressed pages */
386
386
diff -ruN a/storage/innodb_plugin/include/univ.i b/storage/innodb_plugin/include/univ.i
387
387
--- a/storage/innodb_plugin/include/univ.i      2010-08-04 02:24:19.000000000 +0900
388
388
+++ b/storage/innodb_plugin/include/univ.i      2010-08-27 16:44:21.698059254 +0900
389
 
@@ -284,9 +284,13 @@
 
389
@@ -286,9 +286,13 @@
390
390
 */
391
391
 
392
392
 /* The 2-logarithm of UNIV_PAGE_SIZE: */
402
402
 
403
403
 /* Maximum number of parallel threads in a parallelized operation */
404
404
 #define UNIV_MAX_PARALLELISM   32
405
 
@@ -400,7 +404,7 @@
 
405
@@ -402,7 +406,7 @@
406
406
 stored part of the field in the tablespace. The length field then
407
407
 contains the sum of the following flag and the locally stored len. */
408
408
 
411
411
 
412
412
 /* Some macros to improve branch prediction and reduce cache misses */
413
413
 #if defined(__GNUC__) && (__GNUC__ > 2) && ! defined(__INTEL_COMPILER)
414
 
@@ -503,4 +507,6 @@
 
414
@@ -505,4 +509,6 @@
415
415
        UNIV_MEM_ALLOC(addr, size);                     \
416
416
 } while (0)
417
417
 
570
570
diff -ruN a/storage/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
571
571
--- a/storage/innodb_plugin/srv/srv0start.c     2010-08-27 16:40:36.602058774 +0900
572
572
+++ b/storage/innodb_plugin/srv/srv0start.c     2010-08-27 16:44:21.720021228 +0900
573
 
@@ -1506,10 +1506,12 @@
 
573
@@ -1512,10 +1512,12 @@
574
574
        }
575
575
 #endif /* UNIV_LOG_ARCHIVE */
576
576
 
585
585
 
586
586
                return(DB_ERROR);
587
587
        }
588
 
@@ -1518,7 +1520,7 @@
 
588
@@ -1524,7 +1526,7 @@
589
589
 
590
590
        for (i = 0; i < srv_n_data_files; i++) {
591
591
 #ifndef __WIN__