aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2000-09-27 10:41:55 +0000
committerPeter Eisentraut <peter_e@gmx.net>2000-09-27 10:41:55 +0000
commit64610a82f2f352e98595f88e247879ba6bab6b9e (patch)
treed975d5f98a81cbefff0aaac161eab607210a82b7 /src
parent76f286b2ce6029f5715f79ff282faab2dd73e9a5 (diff)
downloadpostgresql-64610a82f2f352e98595f88e247879ba6bab6b9e.tar.gz
postgresql-64610a82f2f352e98595f88e247879ba6bab6b9e.zip
Reset current user id to session user id during transaction abort
Diffstat (limited to 'src')
-rw-r--r--src/backend/access/transam/xact.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 812e137071c..9a52b2ff09c 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.70 2000/08/06 04:17:47 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.71 2000/09/27 10:41:55 petere Exp $
*
* NOTES
* Transaction aborts can now occur two ways:
@@ -162,6 +162,7 @@
#include "commands/trigger.h"
#include "executor/spi.h"
#include "libpq/be-fsstubs.h"
+#include "miscadmin.h"
#include "storage/proc.h"
#include "storage/sinval.h"
#include "utils/inval.h"
@@ -1088,6 +1089,11 @@ AbortTransaction()
if (s->state != TRANS_INPROGRESS)
elog(NOTICE, "AbortTransaction and not in in-progress state");
+ /*
+ * Reset user id which might have been changed transiently
+ */
+ SetUserId(GetSessionUserId());
+
/* ----------------
* Tell the trigger manager that this transaction is about to be
* aborted.