diff --git a/src/bin/psql/psqlHelp.h b/src/bin/psql/psqlHelp.h index a4f5215c547ba6e2f55cdaea6796fa00981502d6..90f86929bbfb1eecaba708896bdf89525e19c748 100644 --- a/src/bin/psql/psqlHelp.h +++ b/src/bin/psql/psqlHelp.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: psqlHelp.h,v 1.16 1997/06/01 04:53:44 momjian Exp $ + * $Id: psqlHelp.h,v 1.17 1997/06/02 14:12:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -154,7 +154,7 @@ static struct _helpStruct QL_HELP[] = { "purge [before ] [after ];"}, { "reset", "set run-time environment back to default", - "reset {DateStyle | GEQO}"}, + "reset {DateStyle | GEQO | R_PLANS}"}, { "revoke", "revoke access control from a user or group", "revoke on [,...] from \n[public | group | ]\n\t privilege is {ALL | SELECT | INSERT | UPDATE | DELETE | RULE}"}, @@ -166,10 +166,10 @@ static struct _helpStruct QL_HELP[] = { "select [distinct on ] [as ], ... [as ]\n\t[into table ] [from ]\n\t[where ]\n\t[order by \n\t\t[using ],.. [[using ] | ASC | DESC]];" }, { "set", "set run-time environment", - "set DateStyle {ISO | SQL | Postgres | European | US | NonEuropean}\nset GEQO = {ON | OFF}\nset R_PLANS {ON | OFF}"}, + "set DateStyle {ISO | SQL | Postgres | European | US | NonEuropean}\nset GEQO = {ON[=#] | OFF}\nset R_PLANS {ON | OFF}"}, { "show", "show current run-time environment", - "show {DateStyle | GEQO}"}, + "show {DateStyle | GEQO | R_PLANS}"}, { "update", "update tuples", "update set =,...= [from ] [where ];"}, diff --git a/src/man/set.l b/src/man/set.l index aa23bcde995bb13620d6cf67e35f184068a5e017..889e35b3ea169345c6a0f6889ee83691a8782814 100644 --- a/src/man/set.l +++ b/src/man/set.l @@ -1,6 +1,6 @@ .\" This is -*-nroff-*- .\" XXX standard disclaimer belongs here.... -.\" $Header: /cvsroot/pgsql/src/man/Attic/set.l,v 1.2 1997/06/01 04:23:12 momjian Exp $ +.\" $Header: /cvsroot/pgsql/src/man/Attic/set.l,v 1.3 1997/06/02 14:12:40 momjian Exp $ .TH SET SQL 05/14/97 PostgreSQL PostgreSQL .SH NAME set \(em set run-time parameters for session @@ -28,11 +28,13 @@ See .IR "built-in" (3) for more information on available styles. +.ce 1 +\fBDateStyle Values\fR + .if n .ta 5 +15 +40 .if t .ta 0.5i +1.5i +3.0i .in 0 .nf -DateStyle ISO - use ISO 8601-style dates and times SQL - use Oracle/Ingres-style dates and times Postgres - use traditional Postgres format @@ -45,17 +47,21 @@ DateStyle .IR GEQO enables or disables the genetic optimizer algorithm. This algorithm is .IR on -by default. See the GEQO README for more information. +by default, which used GEQO for statements of six or more tables. +See the GEQO README for more information. + +.ce 1 +\fBGEQO Values\fR .if n .ta 5 +15 +40 .if t .ta 0.5i +1.5i +3.0i .in 0 .nf -GEQO - on - turn the genetic optimizer 'on' - off - duh + on - use for statements with 6 or more tables + on=10 - use for statements with 10 or more tables + off - do not use the genetic optimizer .fi - +The default is on. .PP .IR R_PLANS enables or disables right-hand evaluation of plans. This algorithm is @@ -68,7 +74,7 @@ by default. .nf R_PLANS on - turn right-hand plan evaluation 'on' - off - duh + off - do not use right-hand plan evaluation .fi .SH EXAMPLES @@ -88,6 +94,10 @@ set DateStyle to 'SQL,European' .PP .nf -- +--Use GEQO for statements with 4 or more tables +-- +set GEQO to on=4 +-- --Turn off the genetic optimizer -- set GEQO to 'off'