summaryrefslogtreecommitdiff
path: root/src/backend/access/transam/xact.c
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2007-03-12 22:09:28 +0000
committerPeter Eisentraut <peter_e@gmx.net>2007-03-12 22:09:28 +0000
commitf84308f1958313f6cd1644d74b6a8ff49a871f8d (patch)
tree3026d351be974b2172c781ef46ca07937c1bc3a0 /src/backend/access/transam/xact.c
parenteee22892872424b4c1f2623020c929a10399e831 (diff)
downloadpostgresql-f84308f1958313f6cd1644d74b6a8ff49a871f8d.tar.gz
Make configuration parameters fall back to their default values when they
are removed from the configuration file. Joachim Wieland
Diffstat (limited to 'src/backend/access/transam/xact.c')
-rw-r--r--src/backend/access/transam/xact.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index ab8b5fd8b4..db81e3bd70 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.234 2007/02/09 03:35:33 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.235 2007/03/12 22:09:27 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1513,6 +1513,9 @@ CommitTransaction(void)
/* NOTIFY commit must come before lower-level cleanup */
AtCommit_Notify();
+ /* GUC processing could abort transaction */
+ AtEOXact_GUC(true, false);
+
/*
* Update flat files if we changed pg_database, pg_authid or
* pg_auth_members. This should be the last step before commit.
@@ -1623,7 +1626,6 @@ CommitTransaction(void)
/* Check we've released all catcache entries */
AtEOXact_CatCache(true);
- AtEOXact_GUC(true, false);
AtEOXact_SPI(true);
AtEOXact_on_commit_actions(true);
AtEOXact_Namespace(true);