felipe                                   Sat, 20 Mar 2010 18:19:16 +0000

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

Log:
- Fixed bug #49429, #51331 (odbc_autocommit doesn't work)

Bugs: http://bugs.php.net/49429 (Open) Problem with odbc_autocommit
      http://bugs.php.net/51331 (Open) ODBC DB2 autocommit don't work
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/odbc/php_odbc.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2010-03-20 17:50:44 UTC (rev 296466)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-03-20 18:19:16 UTC (rev 296467)
@@ -41,6 +41,7 @@
 - Fixed bug #50358 (Compile failure compiling ext/phar/util.lo). (Felipe)
 - Fixed bug #49778 (DateInterval::format("%a") is always zero when an interval
   is created from an ISO string). (Derick)
+- Fixed bug #49429 (odbc_autocommit doesn't work). (Felipe)
 - Fixed bug #49059 (DateTime::diff() repeats previous sub() operation).
   (yoa...@gmail.com, Derick)
 - Fixed bug #48902 (Timezone database fallback map is outdated). (Derick)

Modified: php/php-src/branches/PHP_5_3/ext/odbc/php_odbc.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/odbc/php_odbc.c    2010-03-20 17:50:44 UTC 
(rev 296466)
+++ php/php-src/branches/PHP_5_3/ext/odbc/php_odbc.c    2010-03-20 18:19:16 UTC 
(rev 296467)
@@ -2864,7 +2864,7 @@

        ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, 
"ODBC-Link", le_conn, le_pconn);

-       if (pv_onoff) {
+       if (ZEND_NUM_ARGS() > 1) {
                rc = SQLSetConnectOption(conn->hdbc, SQL_AUTOCOMMIT, (pv_onoff) 
? SQL_AUTOCOMMIT_ON : SQL_AUTOCOMMIT_OFF);
                if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
                        odbc_sql_error(conn, SQL_NULL_HSTMT, "Set autocommit");

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

Reply via email to