summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2004-04-19 21:21:34 +0000
committerBruce Momjian2004-04-19 21:21:34 +0000
commit09f317539a4be45557ca600698d8f129629f1059 (patch)
treed1eabbf99804c7532be6bc4510b315343446d2f4
parent31338352bd89439c7c55d25c13d88338fa874771 (diff)
Fix for BEGIN with ISOLATION/READONLY clauses.
Fix for code originally added for 7.5.
-rw-r--r--src/backend/tcop/utility.c15
-rw-r--r--src/backend/utils/misc/guc.c4
2 files changed, 9 insertions, 10 deletions
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 11b3ff168ac..45bf7d0f1c0 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.211 2004/03/23 19:35:17 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.212 2004/04/19 21:21:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -302,15 +302,12 @@ ProcessUtility(Node *parsetree,
switch (stmt->kind)
{
+ /*
+ * START TRANSACTION, as defined by SQL99:
+ * Identical to BEGIN, except that it takes a few
+ * additional options. Same code for both.
+ */
case TRANS_STMT_BEGIN:
- BeginTransactionBlock();
- break;
-
- /*
- * START TRANSACTION, as defined by SQL99:
- * Identical to BEGIN, except that it takes a few
- * additional options.
- */
case TRANS_STMT_START:
{
BeginTransactionBlock();
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 5f12a374097..60efee3d924 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.199 2004/04/07 18:52:26 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.200 2004/04/19 21:21:34 momjian Exp $
*
*--------------------------------------------------------------------
*/
@@ -3394,6 +3394,8 @@ void
SetPGVariable(const char *name, List *args, bool is_local)
{
char *argstring = flatten_set_variable_args(name, args);
+printf("bjm: %s %s\n", name, argstring);
+fflush(stdout);
/* Note SET DEFAULT (argstring == NULL) is equivalent to RESET */
set_config_option(name,