← Back to branch summary

~percona-dev/percona-server/5.1.57-partially-ported

« back to all changes in this revision

Viewing changes to innodb_buffer_pool_shm.patch

  • Committer: Oleg Tsarev
  • Date: 2011-05-10 00:07:01 UTC
  • Revision ID: oleg.tsarev@percona.com-20110510000701-l08jx5er0g8ogi6w
Patches ported to 5.1.57
ATTENTION, ATTENTION, ATTENTION
!!!
Some parts of innodb_split_buf_pool_mutex.patch was removed (for apply another patches)
You should revert changes in this commit from patch and do their right

!!! 
innodb_lru_dump_restore.patch has some changes, what should be reviewed

!!!
mysql-test.diff - I removed part for "mysql-test/include/mtr_warnings.sql", should be restored and fixed

All other looks fine.

UNFORTUNATELY, MYSQL DOESN'T BUILD (Compilation error in InnoDB).

ATTENTION, ATTENTION, ATTENTION

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_buffer_pool_shm.patch
736
736
 
737
737
 /** @name Modes for buf_page_get_gen */
738
738
 /* @{ */
739
 
@@ -1300,7 +1301,10 @@
 
739
@@ -1302,7 +1303,10 @@
740
740
 /**********************************************************************//**
741
741
 Compute the hash fold value for blocks in buf_pool->zip_hash. */
742
742
 /* @{ */
780
780
 #ifndef UNIV_HOTBACKUP
781
781
 /*************************************************************//**
782
782
 Creates a mutex array to protect a hash table. */
783
 
@@ -327,6 +349,33 @@
784
 
                }\
 
783
@@ -328,6 +350,33 @@
785
784
        }\
786
785
 } while (0)
787
 
+
 
786
 
788
787
+/********************************************************************//**
789
788
+Align nodes with moving location.*/
790
789
+#define HASH_OFFSET(TABLE, NODE_TYPE, PTR_NAME, FADDR, FOFFSET, BOFFSET) \
811
810
+               }\
812
811
+       }\
813
812
+} while (0)
814
 
 
 
813
+
815
814
 /************************************************************//**
816
815
 Gets the mutex index for a fold value in a hash table.
 
816
 @return        mutex number */
817
817
diff -ruN a/storage/innodb_plugin/include/os0proc.h b/storage/innodb_plugin/include/os0proc.h
818
818
--- a/storage/innodb_plugin/include/os0proc.h   2010-06-04 00:49:59.000000000 +0900
819
819
+++ b/storage/innodb_plugin/include/os0proc.h   2010-07-14 16:40:16.169321536 +0900
1131
1131
diff -ruN a/storage/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
1132
1132
--- a/storage/innodb_plugin/srv/srv0start.c     2010-07-14 16:33:23.851391514 +0900
1133
1133
+++ b/storage/innodb_plugin/srv/srv0start.c     2010-07-14 16:40:16.180321173 +0900
1134
 
@@ -1744,6 +1744,8 @@
 
1134
@@ -1750,6 +1750,8 @@
1135
1135
                Note that this is not as heavy weight as it seems. At
1136
1136
                this point there will be only ONE page in the buf_LRU
1137
1137
                and there must be no page in the buf_flush list. */