pgpool2.git / summary / log / commit / refs
commit df4b8643341f7ebf46b500e5ee4ec5f08e656246
Author: Tatsuo Ishii <ishii at sraoss.co.jp>
Date: Wed Jun 09 11:33:48 2010 +0000
Fix typo in help message from main program.
Add description about --discard-status to docs.
Fix description about replication_stop_on_mismatch.
doc/pgpool-en.html | 15 +++++++++------
doc/pgpool-ja.html | 25 ++++++++++++++-----------
main.c | 2 +-
3 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/doc/pgpool-en.html b/doc/pgpool-en.html
index e1876a4d0..c1e7fcc15 100644
--- a/doc/pgpool-en.html
+++ b/doc/pgpool-en.html
@@ -7,7 +7,7 @@
</head>
<!-- hhmts start -->
-Last modified: Mon Jun 7 17:13:27 JST 2010
+Last modified: Wed Jun 9 20:23:10 JST 2010
<!-- hhmts end -->
<body bgcolor="#ffffff">
@@ -834,10 +834,12 @@ configuration parameters below must be set in addtion to everything above.</p>
<dt>replication_stop_on_mismatch</dt>
<dd>
- <p>When set to true, pgpool-II degenerates the
- backends and keeps the service only with the Master DB if data
- mismatch occurs. If false, pgpool-II just
- terminates the query. Default is false.</p>
+ <p>When set to true, if a SELECT statement returns a result set of records
+ different between the backends, the backends that differ from most
+ frequent result set are degenerated. This is only valid if the SELECT
+ statement is part of a transaction and replicate_select is set to true.
+ If set to false, the session is terminated and the backends are not
+ degenerated. Default is false.</p>
</dd>
<a name="replicate_select">
@@ -1444,7 +1446,7 @@ before starting pgpool-II.
</p>
<pre>
-pgpool [-c][-f config_file][-a hba_file][-F pcp_config_file][-n][-d]
+pgpool [-c][-f config_file][-a hba_file][-F pcp_config_file][-n][-D][-d]
</pre>
<p>
<table>
@@ -1453,6 +1455,7 @@ pgpool [-c][-f config_file][-a hba_file][-F pcp_config_file][-n][-d]
<tr><td>-a hba_file<br/>--hba-file hba_file</td><td>specifies pool_hba.conf</tr>
<tr><td>-F pcp_config_file<br/>--pcp-password-file</td><td>specifies pcp.conf</tr>
<tr><td>-n<br/>--no-daemon</td><td>no daemon mode (terminal is not detached)</tr>
+ <tr><td>-D<br/>--discard-status</td><td>Discard pgpool_status file and do not restore previous status</tr>
<tr><td>-d<br/>--debug</td><td>debug mode</tr>
</table>
There are two ways to stop pgpool-II. One is via PCP command
diff --git a/doc/pgpool-ja.html b/doc/pgpool-ja.html
index 2e47902ad..2caba7d49 100644
--- a/doc/pgpool-ja.html
+++ b/doc/pgpool-ja.html
@@ -8,7 +8,7 @@
<body>
<!-- hhmts start -->
-Last modified: Mon Jun 7 17:14:56 JST 2010
+Last modified: Wed Jun 9 20:30:34 JST 2010
<!-- hhmts end -->
<body bgcolor="#ffffff">
@@ -828,9 +828,11 @@ raw$B%b!<%I!"%3%M%/%7%g%s%W!<%k%b!<%I$K2C$(!"0J2<$r@_Dj$7$^$9!#(B
<dt>replication_stop_on_mismatch
<dd>
<p>
- true$B$r;XDj$9$k$H%^%9%?!<(BDB$B$HB>$N(BDB$B%N!<%I$N4V$G%G!<%?$NIT0lCW$,$"$C$?>l9g(B
- $B$K6/@)E*$K=LB`1?E>$KF~$j$^$9!#$3$N%*%W%7%g%s$,(Bfalse$B$N>l9g$O!"3:Ev$N(B
- $BLd$$9g$o$;$r6/@)E*$K=*N;$9$k$@$1$KN1$a$^$9!#%G%U%)%k%HCM$O(Bfalse$B$G$9!#(B
+ true$B$r;XDj$,;XDj$5$l$F$$$F!"$+$D%H%i%s%6%/%7%g%s$NCf$G<B9T$5$l$?(BSELECT$B7k2L$,(BDB$B%N!<%I$N4V$GIT0lCW$K$J$C$?>l9g$K!"$=$N(BDB$B%N!<%I$r@Z$jJ|$7$F=LB`1?E>$KF~$j$^$9!#(B
+$B=LB`BP>]$N(BDB$B%N!<%I$O!VB??t7h!W$G>/?tGI$K$J$C$?$b$N$,BP>]$K$J$j$^$9!#(B
+$B$b$7B??t7h$GF1I<$K$J$C$?>l9g$O!"%^%9%?(BDB$B%N!<%I(B(DB$B%N!<%IHV9f$,$b$C$H$b$o$+$$$b$N(B)$B$r4^$`%0%k!<%W$,M%@h$5$l!"$=$l0J30$N%0%k!<%W$K=jB0$9$k(BDB$B%N!<%I$,@Z$jJ|$7$NBP>]$K$J$j$^$9!#(B
+$B$3$N%*%W%7%g%s$,(Bfalse$B$N>l9g$O!"3:Ev$NLd$$9g$o$;$r6/@)E*$K=*N;$9$k$@$1$KN1$a$^$9!#(B
+$B%G%U%)%k%HCM$O(Bfalse$B$G$9!#(B
</p>
<a name="replicate_select">
@@ -1509,17 +1511,18 @@ CREATE TABLE pgpool_catalog.query_cache (
$B0J>e$G@_Dj$,=*$o$C$?$N$G!"3F(BDB$B%N!<%I$r5/F0$7!"I,MW$J$i$P%7%9%F%`(BDB$B$b5/F0(B
$B$7$F$+$i(Bpgpool-II$B$r5/F0$7$^$9!#(B
<pre>
-pgpool [-c][-f config_file][-a hba_file][-F pcp_config_file][-n][-d]
+pgpool [-c][-f config_file][-a hba_file][-F pcp_config_file][-n][-D][-d]
</pre>
</p>
<p>
<table>
-<tr><td>-c</td><td>$B%/%(%j%-%c%C%7%e$r>C5n$7$^$9(B</tr>
-<tr><td>-f config_file</td><td>pgpool-II$B$N@_Dj%U%!%$%k$r;XDj$7$^$9(B</tr>
-<tr><td>-a hba_file</td><td>HBA$BG'>Z@_Dj%U%!%$%k$r;XDj$7$^$9(B</tr>
-<tr><td>-F pcp_config_file</td><td>pcp$B$N@_Dj%U%!%$%k$r;XDj$7$^$9(B</tr>
-<tr><td>-n</td><td>$B%G!<%b%s%b!<%I$G5/F0$7$^$;$s(B($B@)8fC<Kv$r@Z$jN%$7$^$;$s(B</tr>
-<tr><td>-d</td><td>$B%G%P%C%0%b!<%I$G5/F0$7$^$9(B</tr>
+<tr><td>-c</td><td>$B%/%(%j%-%c%C%7%e$r>C5n$7$^$9(B</td></tr>
+<tr><td>-f config_file</td><td>pgpool-II$B$N@_Dj%U%!%$%k$r;XDj$7$^$9(B</td></tr>
+<tr><td>-a hba_file</td><td>HBA$BG'>Z@_Dj%U%!%$%k$r;XDj$7$^$9(B</td></tr>
+<tr><td>-F pcp_config_file</td><td>pcp$B$N@_Dj%U%!%$%k$r;XDj$7$^$9(B</td></tr>
+<tr><td>-n</td><td>$B%G!<%b%s%b!<%I$G5/F0$7$^$;$s(B($B@)8fC<Kv$r@Z$jN%$7$^$;$s(B</td></tr>
+<tr><td>-D</td><td>pgpool_status$B$r:o=|$7!"0JA0$N>uBV$rI|85$7$^$;$s(B</td></tr>
+<tr><td>-d</td><td>$B%G%P%C%0%b!<%I$G5/F0$7$^$9(B</td></tr>
</table>
</p>
<p>
diff --git a/main.c b/main.c
index e585ce34b..13da37788 100644
--- a/main.c
+++ b/main.c
@@ -683,7 +683,7 @@ static void usage(void)
fprintf(stderr, "Start options:\n");
fprintf(stderr, " -c, --clear Clears query cache (enable_query_cache must be on)\n");
fprintf(stderr, " -n, --dont-detach Don't run in daemon mode, does not detach control tty\n");
- fprintf(stderr, " -D, --discard-status Discard pool_sttaus file and do not restore previous status\n");
+ fprintf(stderr, " -D, --discard-status Discard pgpool_status file and do not restore previous status\n");
fprintf(stderr, " -d, --debug Debug mode\n\n");
fprintf(stderr, "Stop options:\n");
fprintf(stderr, " -m, --mode=SHUTDOWN-MODE\n");
[parent: 2672710d6c3c]