summaryrefslogtreecommitdiff
path: root/ext/dba/dba_db4.c
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2011-06-27 22:58:59 +0000
committerChristopher Jones <sixd@php.net>2011-06-27 22:58:59 +0000
commitfe62d3739b1405c1cf9f5864ab66d030b2798b09 (patch)
tree455cba42d98e0f6c8ce7dd6f4ead4678384f744e /ext/dba/dba_db4.c
parent74c6b760932cf57c709543521d38974a8e0fd7fb (diff)
downloadphp-git-fe62d3739b1405c1cf9f5864ab66d030b2798b09.tar.gz
Keep the DBA DB4 test status quo after Berkeley DB 5.2 introduced error message prefixes
Diffstat (limited to 'ext/dba/dba_db4.c')
-rw-r--r--ext/dba/dba_db4.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/dba/dba_db4.c b/ext/dba/dba_db4.c
index a935485387..b47aed160c 100644
--- a/ext/dba/dba_db4.c
+++ b/ext/dba/dba_db4.c
@@ -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;
}
}