diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-08-21 01:11:32 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-08-21 01:11:32 +0000 |
| commit | 140d4ebcb46e17cdb1be43892ed797e5e060c8ef (patch) | |
| tree | f99d209dbe5e40dcb434c3841e0c8b4ff383f453 /src/backend/utils/misc/guc.c | |
| parent | 4e94d1f952c3ce5670ceae3c12b55e344503a701 (diff) | |
Tsearch2 functionality migrates to core. The bulk of this work is by
Oleg Bartunov and Teodor Sigaev, but I did a lot of editorializing,
so anything that's broken is probably my fault.
Documentation is nonexistent as yet, but let's land the patch so we can
get some portability testing done.
Diffstat (limited to 'src/backend/utils/misc/guc.c')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index a05b3be3937..e70768aa840 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.413 2007/08/19 01:41:25 adunstan Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.414 2007/08/21 01:11:19 tgl Exp $ * *-------------------------------------------------------------------- */ @@ -25,7 +25,6 @@ #include <syslog.h> #endif - #include "access/gin.h" #include "access/transam.h" #include "access/twophase.h" @@ -58,6 +57,7 @@ #include "storage/fd.h" #include "storage/freespace.h" #include "tcop/tcopprot.h" +#include "tsearch/ts_cache.h" #include "utils/builtins.h" #include "utils/guc_tables.h" #include "utils/memutils.h" @@ -2240,8 +2240,9 @@ static struct config_string ConfigureNamesString[] = { {"log_destination", PGC_SIGHUP, LOGGING_WHERE, gettext_noop("Sets the destination for server log output."), - gettext_noop("Valid values are combinations of \"stderr\", \"syslog\", " - " \"csvlog\" and \"eventlog\", depending on the platform."), + gettext_noop("Valid values are combinations of \"stderr\", " + "\"syslog\", \"csvlog\", and \"eventlog\", " + "depending on the platform."), GUC_LIST_INPUT }, &log_destination_string, @@ -2434,6 +2435,15 @@ static struct config_string ConfigureNamesString[] = "content", assign_xmloption, NULL }, + { + {"default_text_search_config", PGC_USERSET, CLIENT_CONN_LOCALE, + gettext_noop("Sets default text search configuration."), + NULL + }, + &TSCurrentConfig, + "pg_catalog.simple", assignTSCurrentConfig, NULL + }, + #ifdef USE_SSL { {"ssl_ciphers", PGC_POSTMASTER, CONN_AUTH_SECURITY, |