summaryrefslogtreecommitdiff
path: root/ext/pdo_odbc
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-10-09 13:14:31 +0800
committerXinchen Hui <laruence@php.net>2012-10-09 13:15:18 +0800
commit931571260b28bec7c53e57803e03ee0c38e8595e (patch)
tree794dfdfcbd75d80e30c4567af74fdcb1df0f4d09 /ext/pdo_odbc
parent67611c67fa5a3b2c199d41ef7df3307308c56faa (diff)
parent45e0d452c5c369f0141fde780a6cbdd35d8f55b4 (diff)
downloadphp-git-931571260b28bec7c53e57803e03ee0c38e8595e.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
Diffstat (limited to 'ext/pdo_odbc')
-rwxr-xr-xext/pdo_odbc/odbc_driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c
index 84a147b80c..ca2808c6f5 100755
--- a/ext/pdo_odbc/odbc_driver.c
+++ b/ext/pdo_odbc/odbc_driver.c
@@ -114,7 +114,7 @@ void pdo_odbc_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, PDO_ODBC_HSTMT statement,
* diagnostic records (which can be generated by PRINT statements
* in the query, for instance). */
while (rc == SQL_SUCCESS || rc == SQL_SUCCESS_WITH_INFO) {
- char discard_state[5];
+ char discard_state[6];
char discard_buf[1024];
SQLINTEGER code;
rc = SQLGetDiagRec(htype, eh, recno++, discard_state, &code,