diff options
Diffstat (limited to 'src/backend/utils/misc')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 3 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index c2c1318b4cb..87df3fdbacd 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.318 2006/05/02 11:28:55 teodor Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.319 2006/05/11 19:15:35 tgl Exp $ * *-------------------------------------------------------------------- */ @@ -46,6 +46,7 @@ #include "optimizer/geqo.h" #include "optimizer/paths.h" #include "optimizer/planmain.h" +#include "parser/gramparse.h" #include "parser/parse_expr.h" #include "parser/parse_relation.h" #include "parser/scansup.h" diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 84c9f795848..dac59378a07 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -279,7 +279,7 @@ # warning # error # panic(off) - + #log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements # and their durations, in milliseconds. @@ -415,8 +415,8 @@ #add_missing_from = off #array_nulls = on #default_with_oids = off -escape_string_warning = on # warn about backslashes in string literals -#standard_conforming_strings = off # SQL standard string literal processing +#escape_string_warning = on +#standard_conforming_strings = off #regex_flavor = advanced # advanced, extended, or basic #sql_inheritance = on |