clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep the DBA DB4 test status quo after Berkeley DB 5.2 introduced error message prefixes

Browse Source
This commit is contained in:
Christopher Jones 2011-06-27 22:58:59 +00:00
parent e788932a91
commit 0c2ee427d7
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS
View File

@ -7,8 +7,11 @@ PHP NEWS
- DateTime extension:
. Fixed bug where the DateTime object got changed while using date_diff().
(Derick)
- DBA extension:
. Supress warning on non-existent file open with Berkeley DB 5.2 (Chris Jones)
- PDO ODBC:
- PDO ODBC driver:
. Fixed data type usage in 64bit. (leocsilva at gmail dot com)

5
ext/dba/dba_db4.c
View File

@ -46,11 +46,12 @@ static void php_dba_db4_errcall_fcn(
#if (DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8))
/* Bug 51086, Berkeley DB 4.8.26 */
/* This code suppresses a BDB 4.8 error message that BDB incorrectly emits */
/* This code suppresses a BDB 4.8+ error message, thus keeping PHP test compatibility */
{
char *function = get_active_function_name(TSRMLS_C);
if (function && (!strcmp(function,"dba_popen") || !strcmp(function,"dba_open"))
&& !strncmp(msg, "fop_read_meta", sizeof("fop_read_meta")-1)) {
&& (!strncmp(msg, "fop_read_meta", sizeof("fop_read_meta")-1)
|| !strncmp(msg, "BDB0004 fop_read_meta", sizeof("BDB0004 fop_read_meta")-1))) {
return;
}
}