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 53859d49314e65192c0d942ca8c90ee83e6693a0..fc7c94d56f8cd0fbb332a85d63474829fc1c41ee 100755 (executable)
--- 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;
        }