aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/misc
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2010-01-26 16:33:40 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2010-01-26 16:33:40 +0000
commitd879697cd291a31c635edf17c4b8c170ac40ffc1 (patch)
treec8d673ff347fb4e42b78ca3c18c3dfa822a0e5a4 /src/backend/utils/misc
parent6c0f94fc0daa9ff1aa5636aea25afb4d5c6d767e (diff)
downloadpostgresql-d879697cd291a31c635edf17c4b8c170ac40ffc1.tar.gz
postgresql-d879697cd291a31c635edf17c4b8c170ac40ffc1.zip
Remove the default_do_language parameter, instead making DO use a hardwired
default of "plpgsql". This is more reasonable than it was when the DO patch was written, because we have since decided that plpgsql should be installed by default. Per discussion, having a parameter for this doesn't seem useful enough to justify the risk of application breakage if the value is changed unexpectedly.
Diffstat (limited to 'src/backend/utils/misc')
-rw-r--r--src/backend/utils/misc/guc.c13
-rw-r--r--src/backend/utils/misc/postgresql.conf.sample1
2 files changed, 1 insertions, 13 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index ab1b84ba607..00ea55d5979 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.535 2010/01/24 21:49:17 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.536 2010/01/26 16:33:40 tgl Exp $
*
*--------------------------------------------------------------------
*/
@@ -383,8 +383,6 @@ char *external_pid_file;
char *pgstat_temp_directory;
-char *default_do_language;
-
char *application_name;
int tcp_keepalives_idle;
@@ -2604,15 +2602,6 @@ static struct config_string ConfigureNamesString[] =
#endif /* USE_SSL */
{
- {"default_do_language", PGC_USERSET, CLIENT_CONN_STATEMENT,
- gettext_noop("Sets the language used in DO statement if LANGUAGE is not specified."),
- NULL
- },
- &default_do_language,
- "plpgsql", NULL, NULL
- },
-
- {
{"application_name", PGC_USERSET, LOGGING,
gettext_noop("Sets the application name to be reported in statistics and logs."),
NULL,
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 2b4e761096f..95cab4d64fd 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -432,7 +432,6 @@
#temp_tablespaces = '' # a list of tablespace names, '' uses
# only default tablespace
#check_function_bodies = on
-#default_do_language = 'plpgsql'
#default_transaction_isolation = 'read committed'
#default_transaction_read_only = off
#session_replication_role = 'origin'