From: Wez Furlong <wez@php.net>
Date: Sat, 11 Jun 2005 12:36:12 +0000 (+0000)
Subject: and the lesson is, test everything before you commit at 2am
X-Git-Tag: php-5.1.0b2~239
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13ac7169afaa4ecb9d744f2243f12504bf085f48;p=php

and the lesson is, test everything before you commit at 2am
---

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index 53859d4931..fc7c94d56f 100755
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -1116,9 +1116,7 @@ static void dbh_free(pdo_dbh_t *dbh TSRMLS_DC)
 
 static void pdo_dbh_free_storage(pdo_dbh_t *dbh TSRMLS_DC)
 {
-	if (dbh->methods && dbh->methods->rollback) {
-		/* roll back transactions, that are possibly nested, even though we don't
-		 * official support them */
+	if (dbh->in_txn && dbh->methods && dbh->methods->rollback) {
 		dbh->methods->rollback(dbh TSRMLS_CC);
 		dbh->in_txn = 0;
 	}