diff options
| author | Adam Baratz <adambaratz@php.net> | 2016-09-26 17:13:14 -0400 |
|---|---|---|
| committer | Adam Baratz <adambaratz@php.net> | 2016-09-26 17:13:14 -0400 |
| commit | 3d321a4aa44f15271eec976305ad0d8e35e9d8fb (patch) | |
| tree | 4b3cbab26b672cde0444ae7a079ca824e7d54d5e | |
| parent | b4e90e9591532c91554da36a4798e8fb75569124 (diff) | |
| parent | 6887c4a06146252c156bcd270828774ed97b5b9f (diff) | |
| download | php-git-3d321a4aa44f15271eec976305ad0d8e35e9d8fb.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Ignore potentially misleading dberr values
| -rw-r--r-- | ext/pdo_dblib/dblib_driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c index b8ec4fb48e..70d1a1cf60 100644 --- a/ext/pdo_dblib/dblib_driver.c +++ b/ext/pdo_dblib/dblib_driver.c @@ -48,9 +48,9 @@ static int dblib_fetch_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval *info) einfo = &S->err; } - if (einfo->dberr == SYBESMSG && einfo->lastmsg) { + if (einfo->lastmsg) { msg = einfo->lastmsg; - } else if (einfo->dberr == SYBESMSG && DBLIB_G(err).lastmsg) { + } else if (DBLIB_G(err).lastmsg) { msg = DBLIB_G(err).lastmsg; DBLIB_G(err).lastmsg = NULL; } else { |