wez Sat Jun 11 08:36:12 2005 EDT
Modified files:
/php-src/ext/pdo pdo_dbh.c
Log:
and the lesson is, test everything before you commit at 2am
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.75&r2=1.76&ty=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.75 php-src/ext/pdo/pdo_dbh.c:1.76
--- php-src/ext/pdo/pdo_dbh.c:1.75 Fri Jun 10 22:50:20 2005
+++ php-src/ext/pdo/pdo_dbh.c Sat Jun 11 08:36:12 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dbh.c,v 1.75 2005/06/11 02:50:20 wez Exp $ */
+/* $Id: pdo_dbh.c,v 1.76 2005/06/11 12:36:12 wez Exp $ */
/* The PDO Database Handle Class */
@@ -1116,9 +1116,7 @@
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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
