summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-10-09 13:16:53 +0800
committerXinchen Hui <laruence@php.net>2012-10-09 13:16:53 +0800
commit14bfd3126c324861c1cbccb702c7cd5d3d6308ee (patch)
tree2e480db00d3a19ecf1a2195bb0b398a0ef168a66 /ext
parent6cd6a74c5a5b0eb503399848c814dd2f717b076b (diff)
parent931571260b28bec7c53e57803e03ee0c38e8595e (diff)
downloadphp-git-14bfd3126c324861c1cbccb702c7cd5d3d6308ee.tar.gz
Merge branch 'PHP-5.4'
Diffstat (limited to 'ext')
-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,