[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/pdo/pdo_dbh.c branches/PHP_5_3/ext/pdo/pdo_dbh.c trunk/ext/pdo/pdo_dbh.c

[Ilia Alshanetsky]

iliaa                                    Thu, 01 Apr 2010 12:08:55 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=297273

Log:
On beginTransaction() reset error state

Changed paths:
    U   php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
    U   php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
    U   php/php-src/trunk/ext/pdo/pdo_dbh.c

Modified: php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c      2010-04-01 11:51:26 UTC 
(rev 297272)
+++ php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c      2010-04-01 12:08:55 UTC 
(rev 297273)
@@ -597,6 +597,7 @@
 {
        pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC);

+       PDO_DBH_CLEAR_ERR();
        PDO_CONSTRUCT_CHECK;

        if (dbh->in_txn) {

Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c      2010-04-01 11:51:26 UTC 
(rev 297272)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c      2010-04-01 12:08:55 UTC 
(rev 297273)
@@ -851,6 +851,7 @@
                RETURN_FALSE;
        }

+       PDO_DBH_CLEAR_ERR();
        PDO_CONSTRUCT_CHECK;

        if (pdo_dbh_attribute_set(dbh, attr, value TSRMLS_CC) != FAILURE) {

Modified: php/php-src/trunk/ext/pdo/pdo_dbh.c
===================================================================
--- php/php-src/trunk/ext/pdo/pdo_dbh.c 2010-04-01 11:51:26 UTC (rev 297272)
+++ php/php-src/trunk/ext/pdo/pdo_dbh.c 2010-04-01 12:08:55 UTC (rev 297273)
@@ -851,6 +851,7 @@
                RETURN_FALSE;
        }

+       PDO_DBH_CLEAR_ERR();
        PDO_CONSTRUCT_CHECK;

        if (pdo_dbh_attribute_set(dbh, attr, value TSRMLS_CC) != FAILURE) {


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php