From 3488cd43be1282bad08030ec321daccbe62fadc1 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Sat, 20 Mar 2010 18:19:16 +0000 Subject: [PATCH] - Fixed bug #49429, #51331 (odbc_autocommit doesn't work) --- NEWS | 1 + ext/odbc/php_odbc.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 2f58d1ae7c..3fb71d08b0 100644 --- a/NEWS +++ b/NEWS @@ -41,6 +41,7 @@ PHP NEWS - 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). (yoarvi@gmail.com, Derick) - Fixed bug #48902 (Timezone database fallback map is outdated). (Derick) diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index e989b6df20..7274d74f0c 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -2864,7 +2864,7 @@ PHP_FUNCTION(odbc_autocommit) 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"); -- 2.50.1