Remove replication_strict parameter.

diff --git a/definePgpoolConfParam.php b/definePgpoolConfParam.php
index b8957cb68e4c139fa17590741132e9aab4c8ecb5..c03869e337d92b9647865c6677dedd18c9d12efb 100644 (file)
--- a/definePgpoolConfParam.php
+++ b/definePgpoolConfParam.php
@@ -108,10 +108,6 @@ $key = 'replication_mode';
 $pgpoolConfigParam[$key]['type'] ='B';
 $pgpoolConfigParam[$key]['default'] =false;
 
-$key = 'replication_strict';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] =true;
-
 $key = 'replication_timeout';
 $pgpoolConfigParam[$key]['type'] ='N';
 $pgpoolConfigParam[$key]['default'] =5000;
@@ -170,7 +166,7 @@ $pgpoolConfigParam[$key]['default'] =false;
 
 $key = 'ignore_leading_white_space';
 $pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] =false;
+$pgpoolConfigParam[$key]['default'] =true;
 
 $key = 'parallel_mode';
 $pgpoolConfigParam[$key]['type'] ='B';

diff --git a/lang/en.lang.php b/lang/en.lang.php
index 20f3954c6d5a757b794813ad2cc207af8fb8515e..7764a84f147352c6d9f4dd84253997f53eae76ee 100644 (file)
--- a/lang/en.lang.php
+++ b/lang/en.lang.php
@@ -66,7 +66,6 @@ $message = array(
     'descReplication_mode' => 'Set this to true if you are going to use replication functionality',
     'descReplication_stop_on_mismatch' => 'Stop replication mode on data mismatch between master and secondary',
        'descReplicate_select' => 'If true, replicate SELECT queries. If false, send only to master ',
-    'descReplication_strict' => 'If true, pgpool will wait for the completion of the master query before sending a query to the secondary server',
     'descReplication_timeout' => 'In non strict replication mode, there will be a risk of deadlock',
     'descReset_query_list' => 'Semicolon separated SQL commands to be issued at the end of session',
     'descSocket_dir' => 'The socket directory pgpool could connect',

diff --git a/lang/fr.lang.php b/lang/fr.lang.php
index 29274d336035635b8b6f1ca2113c20a83f3ac5df..9c2bd9bc27a5f595864fe1eb656e32c60261b1c9 100644 (file)
--- a/lang/fr.lang.php
+++ b/lang/fr.lang.php
@@ -66,7 +66,6 @@ $message = array(
     'descReplication_mode' => 'Configurer ceci à vrai (true) si vous voulez utiliser la réplication',
     'descReplication_stop_on_mismatch' => 'Stopper le mode réplication en as de différence de données entre le maître et l\'esclave',
     'descReplicate_select' => 'Si vrai, réplique les requêtes SELECT. Si faux, les envoit seulement au maître',
-    'descReplication_strict' => 'Si vrai, pgpool attendra la fin de la requête sur le maître avant d\'envoyer une requête sur le serveur secondaire',
     'descReplication_timeout' => 'Dans le mode de réplication non strict, il y un risque de verrou mortel',
     'descReset_query_list' => 'Commandes SQL séparées par des points-virgules à exécuter à la fin de la session',
     'descSocket_dir' => 'Le répertoire socket de connexion de pgpool',

diff --git a/lang/ja.lang.php b/lang/ja.lang.php
index fe8a5bf1f11ecf00ac2781abb6103d50da9e7a11..90fff369448a61a04f1438fd8b3a2ef5e9d0124d 100644 (file)
--- a/lang/ja.lang.php
+++ b/lang/ja.lang.php
@@ -66,8 +66,7 @@ $message = array(
     'descReplication_mode' => 'レプリケーションモードの有効化',
     'descReplication_stop_on_mismatch' => 'trueを指定するとマスタとセカンダリの間でデータの不一致があった場合に強制的に縮退運転',
        'descReplicate_select' => 'true ならば SELECT をレプリケーションし、false ならばマスタにのみ送信',
-    'descReplication_strict' => 'masterの問い合わせ処理の完了を待ってからsecondaryの処理',
-    'descReplication_timeout' => 'replication_strictがfalseのときにデッドロックを監視するためのタイムアウト時間',
+    'descReplication_timeout' => 'デッドロックを監視するためのタイムアウト時間',
     'descReset_query_list' => 'セッションが終了するときにコネクションを初期化するためのSQLコマンド',
     'descSocket_dir' => 'pgpoolがコネクションを受け付けるUnix domain socketディレクトリ',
     'descSystem_db_dbname' => 'System DBのデータベース名',

diff --git a/templates/pgconfig.tpl b/templates/pgconfig.tpl
index 336aa3c75705fa5765f9e23ee18be97ff205bf73..88d0ed0d0cd7a9d0e12819b7d015473376d28d12 100644 (file)
--- a/templates/pgconfig.tpl
+++ b/templates/pgconfig.tpl
@@ -409,19 +409,6 @@ function cancelNode() {
           {else}
           <td><input type="checkbox" name="replication_mode" id="replication_mode" value="false" /></td>
           {/if} </tr>
-        <tr> {if $error.replication_strict != null}
-          <th class="error"><label>{$message.descReplication_strict|escape}</label>
-                                       <br />replication_strict</th>
-          {else}
-          <th><label>{$message.descReplication_strict|escape}</label>
-                                       <br />replication_strict</th>
-          {/if}
-          {if $params.replication_strict == 'true'}
-          <td><input type="checkbox" name="replication_strict" id="replication_strict" value="true" checked="checked" /></td>
-          {else}
-          <td><input type="checkbox" name="replication_strict" id="replication_strict" value="false" /></td>
-          {/if}
-        </tr>
         <tr> {if $error.replication_timeout != null}
           <th class="error"><label>{$message.descReplication_timeout|escape}</label>
           <br />replication_timeout (integer)</th>