← 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_buffer_pool_shm.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_buffer_pool_shm.patch
742
742
 
743
743
 
744
744
 static char*   internal_innobase_data_file_path        = NULL;
745
 
@@ -2624,6 +2625,14 @@
 
745
@@ -2643,6 +2644,14 @@
746
746
        srv_buf_pool_size = (ulint) innobase_buffer_pool_size;
747
747
        srv_buf_pool_instances = (ulint) innobase_buffer_pool_instances;
748
748
 
757
757
        srv_mem_pool_size = (ulint) innobase_additional_mem_pool_size;
758
758
 
759
759
        srv_n_file_io_threads = (ulint) innobase_file_io_threads;
760
 
@@ -2640,6 +2649,7 @@
 
760
@@ -2659,6 +2668,7 @@
761
761
        srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
762
762
        srv_use_checksums = (ibool) innobase_use_checksums;
763
763
        srv_fast_checksum = (ibool) innobase_fast_checksum;
765
765
 
766
766
 #ifdef HAVE_LARGE_PAGES
767
767
         if ((os_use_large_pages = (ibool) my_use_large_pages))
768
 
@@ -11648,6 +11658,16 @@
 
768
@@ -11702,6 +11712,16 @@
769
769
   "Number of buffer pool instances, set to higher value on high-end machines to increase scalability",
770
770
   NULL, NULL, 1L, 1L, MAX_BUFFER_POOLS, 1L);
771
771
 
782
782
 static MYSQL_SYSVAR_ULONG(commit_concurrency, innobase_commit_concurrency,
783
783
   PLUGIN_VAR_RQCMDARG,
784
784
   "Helps in performance tuning in heavily concurrent environments.",
785
 
@@ -11939,6 +11959,8 @@
 
785
@@ -12000,6 +12020,8 @@
786
786
   MYSQL_SYSVAR(autoextend_increment),
787
787
   MYSQL_SYSVAR(buffer_pool_size),
788
788
   MYSQL_SYSVAR(buffer_pool_instances),
1219
1219
diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
1220
1220
--- a/storage/innobase/srv/srv0start.c  2010-12-04 20:19:29.806482628 +0900
1221
1221
+++ b/storage/innobase/srv/srv0start.c  2010-12-07 16:10:14.964785346 +0900
1222
 
@@ -1835,6 +1835,8 @@
 
1222
@@ -1838,6 +1838,8 @@
1223
1223
                Note that this is not as heavy weight as it seems. At
1224
1224
                this point there will be only ONE page in the buf_LRU
1225
1225
                and there must be no page in the buf_flush list. */