Fix configuration change timing regarding memory_cache_enabled.

This parameter must not be changed after Pgpool-II start but it was
possible to change by reloading.

diff --git a/doc.ja/src/sgml/memcache.sgml b/doc.ja/src/sgml/memcache.sgml
index ee9c4316a2d02686a7412f02801ec42acc486eea..6ec5e3997cf81e21b3a184eb8c311d4d5d557c2e 100644 (file)
--- a/doc.ja/src/sgml/memcache.sgml
+++ b/doc.ja/src/sgml/memcache.sgml
@@ -109,9 +109,9 @@ from the in memory cache is extremely fast.
        </para>
        <para>
          <!--
-              This parameter can be changed by reloading the <productname>Pgpool-II</> configurations.
+            This parameter can only be set at server start.
            -->
-         このパラメータは<productname>Pgpool-II</>の設定を再読み込みすることで変更可能です。
+         このパラメータはサーバ起動時にのみ設定可能です。
 </para>
 </listitem>
 </varlistentry>

diff --git a/doc/src/sgml/memcache.sgml b/doc/src/sgml/memcache.sgml
index 640f2a56ecc90924f13201ca62436de8593ad91d..0983b4a430a988138d78096d7b8ec81ff8bae7ae 100644 (file)
--- a/doc/src/sgml/memcache.sgml
+++ b/doc/src/sgml/memcache.sgml
@@ -67,8 +67,7 @@
            Default is off.
          </para>
          <para>
-            This parameter can be changed by reloading
-            the <productname>Pgpool-II</productname> configurations.
+            This parameter can only be set at server start.
          </para>
        </listitem>
       </varlistentry>

diff --git a/src/config/pool_config_variables.c b/src/config/pool_config_variables.c
index 0c9b62d6ce121c52a0205cc3cd049354ec9fea23..505d226ea57bb871ba627a545f1ba3129fced7d1 100644 (file)
--- a/src/config/pool_config_variables.c
+++ b/src/config/pool_config_variables.c
@@ -459,7 +459,7 @@ static struct config_bool ConfigureNamesBool[] =
        },
        
        {
-               {"memory_cache_enabled", CFGCXT_RELOAD, CACHE_CONFIG,
+               {"memory_cache_enabled", CFGCXT_INIT, CACHE_CONFIG,
                        "Enables the memory cache functionality.",
                        CONFIG_VAR_TYPE_BOOL,false, 0
                },

diff --git a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
index ee91e4c449c02a463f6fb7d8b40dd5f92b6c4973..b9d2bd232d75013f0b43e59470d90f21b80978f5 100644 (file)
--- a/src/sample/pgpool.conf.sample
+++ b/src/sample/pgpool.conf.sample
@@ -699,6 +699,7 @@ check_unlogged_table = on
 #------------------------------------------------------------------------------
 memory_cache_enabled = off
                                                                   # If on, use the memory cache functionality, off by default
+                                   # (change requires restart)
 memqcache_method = 'shmem'
                                                                   # Cache storage method. either 'shmem'(shared memory) or
                                                                   # 'memcached'. 'shmem' by default

diff --git a/src/sample/pgpool.conf.sample-logical b/src/sample/pgpool.conf.sample-logical
index d10f7bb2d5896634ed287d7f2458fea100672243..718e4e2bf2163fd873fc8b1fa404173a456e0f00 100644 (file)
--- a/src/sample/pgpool.conf.sample-logical
+++ b/src/sample/pgpool.conf.sample-logical
@@ -691,6 +691,7 @@ check_unlogged_table = on
 #------------------------------------------------------------------------------
 memory_cache_enabled = off
                                                                   # If on, use the memory cache functionality, off by default
+                                   # (change requires restart)
 memqcache_method = 'shmem'
                                                                   # Cache storage method. either 'shmem'(shared memory) or
                                                                   # 'memcached'. 'shmem' by default

diff --git a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
index 98a5447c844b9fbef5cd9329721adb03203c5ce9..0059461f5c691860342fe1df2be70e55dcd6ec0d 100644 (file)
--- a/src/sample/pgpool.conf.sample-master-slave
+++ b/src/sample/pgpool.conf.sample-master-slave
@@ -697,6 +697,7 @@ check_unlogged_table = on
 #------------------------------------------------------------------------------
 memory_cache_enabled = off
                                                                   # If on, use the memory cache functionality, off by default
+                                   # (change requires restart)
 memqcache_method = 'shmem'
                                                                   # Cache storage method. either 'shmem'(shared memory) or
                                                                   # 'memcached'. 'shmem' by default

diff --git a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
index 694598eb151f7044b29b21b262732539b5714ea5..cfb70614dddf5455a64e9f4427b4c6209ab8eaa7 100644 (file)
--- a/src/sample/pgpool.conf.sample-replication
+++ b/src/sample/pgpool.conf.sample-replication
@@ -696,6 +696,7 @@ check_unlogged_table = on
 #------------------------------------------------------------------------------
 memory_cache_enabled = off
                                                                   # If on, use the memory cache functionality, off by default
+                                   # (change requires restart)
 memqcache_method = 'shmem'
                                                                   # Cache storage method. either 'shmem'(shared memory) or
                                                                   # 'memcached'. 'shmem' by default

diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
index 01e1755fb77feb63c2756c4368240cdfb3d7715c..f12e35ec0f619d9f4cca13157d86e2721bcb4247 100644 (file)
--- a/src/sample/pgpool.conf.sample-stream
+++ b/src/sample/pgpool.conf.sample-stream
@@ -697,6 +697,7 @@ check_unlogged_table = on
 #------------------------------------------------------------------------------
 memory_cache_enabled = off
                                                                   # If on, use the memory cache functionality, off by default
+                                   # (change requires restart)
 memqcache_method = 'shmem'
                                                                   # Cache storage method. either 'shmem'(shared memory) or
                                                                   # 'memcached'. 'shmem' by default