pgpool2.git / summary / log / commit / refs

commit    a968ceeb02aaf220904289d1d86ff963de77e597
Author:   Tatsuo Ishii <ishii at sraoss.co.jp>
Date:     Thu Mar 20 08:33:24 2008 +0000

    Enhance reset_query_list description.


 doc/pgpool-en.html | 22 ++++++++++++++++------
 doc/pgpool-ja.html | 22 +++++++++++++++++-----
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/doc/pgpool-en.html b/doc/pgpool-en.html
index f090af761..2b07d2d55 100644
--- a/doc/pgpool-en.html
+++ b/doc/pgpool-en.html
@@ -7,7 +7,7 @@
 </head>
 
 <!-- hhmts start -->
-Last modified: Thu Mar 20 16:30:27 JST 2008
+Last modified: Thu Mar 20 17:32:31 JST 2008
 <!-- hhmts end -->
 
 <body bgcolor="#ffffff">
@@ -693,11 +693,21 @@ configuration parameters in the raw mode and below.</p>
       reset_query_list = 'ABORT; RESET ALL; SET SESSION AUTHORIZATION DEFAULT'
       </pre>
 
-      Commands differ in each PostgreSQL versions, so be careful
-      especially in PostgreSQL 7.3 or prior. "ABORT" will not be
-      executed outside the transaction block by PostgreSQL 7.4 or
-      above.</p>
-  </dd>
+<p>
+      Commands differ in each PostgreSQL versions. Here are recommended settings.
+</p>
+<p>
+<table border>
+<tr><th>PostgreSQL version</th><th>reset_query_list value</th></tr>
+<tr><td>7.1 or before</td><td>ABORT</td></tr>
+<tr><td>7.2 to 8.2</td><td>ABORT; RESET ALL; SET SESSION AUTHORIZATION DEFAULT</td></tr>
+<tr><td>8.3 or later</td><td>ABORT; DISCARD ALL</td></tr>
+</table>
+</p>
+<p>
+You need to re-read pgpool.conf upon modification of this direrctive.
+</p>
+</dd>
 </dl>
 
 <h4><p>Failover in the Connection Pool Mode</p></h4>
diff --git a/doc/pgpool-ja.html b/doc/pgpool-ja.html
index 915385718..cf4a196dc 100644
--- a/doc/pgpool-ja.html
+++ b/doc/pgpool-ja.html
@@ -8,7 +8,7 @@
 <body>
 
 <!-- hhmts start -->
-Last modified: Thu Mar 20 16:31:36 JST 2008
+Last modified: Thu Mar 20 17:29:30 JST 2008
 <!-- hhmts end -->
 
 <body bgcolor="#ffffff">
@@ -704,15 +704,27 @@ raw$B%b!<%I$K2C$(!$%3%M%/%7%g%s%W!<%j%s%0$,MxMQ$G$-$k$h$&$K$J$j$^$9!%(B
 <pre>
    reset_query_list = 'ABORT; RESET ALL; SET SESSION AUTHORIZATION DEFAULT'
 </pre>
-   PostgreSQL$B$N%P!<%8%g%s$K$h$C$F;HMQ$G$-$k(BSQL$B%3%^%s%I$,0c$&$N$G!$(B
-   PostgreSQL 7.3$B0JA0$G$OCm0U$7$F$/$@$5$$!%(B
 
-   $B$J$*!$!V(BABORT$B!W$O!$(BPostgreSQL 7.4$B0J>e$G$O%H%i%s%6%/%7%g%s%V%m%C%/$N(B
-   $BCf$K$$$J$$>l9g$K$OH/9T$5$l$^$;$s!%(B
+<p>
+   PostgreSQL$B$N%P!<%8%g%s$K$h$C$F;HMQ$G$-$k(BSQL$B%3%^%s%I$,0c$$$^$9$,!$(B
+   $B3F%P!<%8%g%s$4$H$N$*4+$a@_Dj$O0J2<$G$9!%(B
+</p>
+<p>
+<table border>
+<tr><th>PostgreSQL$B%P!<%8%g%s(B</th><th>reset_query_list$B$N@_DjCM(B</th></tr>
+<tr><td>7.1$B0JA0(B</td><td>ABORT</td></tr>
+<tr><td>7.2$B$+$i(B8.2</td><td>ABORT; RESET ALL; SET SESSION AUTHORIZATION DEFAULT</td></tr>
+<tr><td>8.3$B0J9_(B</td><td>ABORT; DISCARD ALL</td></tr>
+</table>
+</p>
+<p>
+   $B!V(BABORT$B!W$O!$(BPostgreSQL 7.4$B0J>e$G$O%H%i%s%6%/%7%g%s%V%m%C%/$NCf$K$$$J$$>l9g$K$OH/9T$5$l$^$;$s!%(B
 </p>
+
 <p>
 $B$3$N%Q%i%a!<%?$rJQ99$7$?;~$K$O@_Dj%U%!%$%k$r:FFI$_9~$_$7$F$/$@$5$$!#(B
 </p>
+</dd>
 
 </dl>
 


[parent: 266d6f58765f]