From: Matteo Beccati <mbeccati@php.net>
Date: Wed, 4 Nov 2009 19:16:39 +0000 (+0000)
Subject: - Reverting previous fix for bug #49985
X-Git-Tag: php-5.2.12RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4bee3fa965bab9590613838ac41f0507119cecd;p=php

- Reverting previous fix for bug #49985
# Unmerged changes from revision 289924
---

diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c
index d74c85ba36..ce53d84922 100644
--- a/ext/pdo_pgsql/pgsql_statement.c
+++ b/ext/pdo_pgsql/pgsql_statement.c
@@ -134,14 +134,6 @@ static int pgsql_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC)
 		/* using a prepared statement */
 
 		if (!S->is_prepared) {
-			/* don't break the whole current transaction when the first
-			 * prepare tentative fails (happens when the prepared statement
-			 * already exists). ignore those SAVEPOINT queries results because 
-			 * we don't care (may be outside transaction?).
-			 */
-			char buf[100]; /* stmt_name == "pdo_pgsql_cursor_%08x" */
-			snprintf(buf, sizeof(buf), "SAVEPOINT %s", S->stmt_name);
-			PQexec(H->server, buf);
 stmt_retry:
 			/* we deferred the prepare until now, because we didn't
 			 * know anything about the parameter types; now we do */
@@ -161,14 +153,12 @@ stmt_retry:
 					/* 42P05 means that the prepared statement already existed. this can happen if you use 
 					 * a connection pooling software line pgpool which doesn't close the db-connection once 
 					 * php disconnects. if php dies (no chance to run RSHUTDOWN) during execution it has no 
-					 * chance to DEALLOCATE the prepared statements it has created. Also happens if we tried
-					 * to DEALLOCATE the same statement name in an aborted transaction. so, if we hit a 42P05
-					 * we deallocate it and retry ONCE (thies 2005.12.15)
+					 * chance to DEALLOCATE the prepared statements it has created. so, if we hit a 42P05 we 
+					 * deallocate it and retry ONCE (thies 2005.12.15)
 					 */
 					if (!strcmp(sqlstate, "42P05")) {
+						char buf[100]; /* stmt_name == "pdo_pgsql_cursor_%08x" */
 						PGresult *res;
-						snprintf(buf, sizeof(buf), "ROLLBACK TO SAVEPOINT %s", S->stmt_name);
-						PQexec(H->server, buf);
 						snprintf(buf, sizeof(buf), "DEALLOCATE %s", S->stmt_name);
 						res = PQexec(H->server, buf);
 						if (res) {
@@ -176,15 +166,11 @@ stmt_retry:
 						}
 						goto stmt_retry;
 					} else {
-						snprintf(buf, sizeof(buf), "RELEASE SAVEPOINT %s", S->stmt_name);
-						PQexec(H->server, buf);
 						pdo_pgsql_error_stmt(stmt, status, sqlstate);
 						return 0;
 					}
 				}
 			}
-			snprintf(buf, sizeof(buf), "RELEASE SAVEPOINT %s", S->stmt_name);
-			PQexec(H->server, buf);
 		}
 		S->result = PQexecPrepared(H->server, S->stmt_name,
 				stmt->bound_params ?