archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'PHP-7.1'

Browse source 
* PHP-7.1:
  update NEWS
  update NEWS
  Ignore potentially misleading dberr values
This commit is contained in:
Adam Baratz 2016-09-26 17:14:51 -04:00
commit 49412756df
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/pdo_dblib/dblib_driver.c
View file

@ -48,9 +48,9 @@ static int dblib_fetch_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval *info)
einfo = &S->err; einfo = &S->err;
} }
if (einfo->dberr == SYBESMSG && einfo->lastmsg) { if (einfo->lastmsg) {
msg = 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; msg = DBLIB_G(err).lastmsg;
DBLIB_G(err).lastmsg = NULL; DBLIB_G(err).lastmsg = NULL;
} else { } else {