From: Christopher Jones <sixd@php.net>
Date: Mon, 27 Jun 2011 22:58:59 +0000 (+0000)
Subject: Keep the DBA DB4 test status quo after Berkeley DB 5.2 introduced error message prefixes
X-Git-Tag: php-5.3.7RC2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c2ee427d762035bba1f34743b3e5959a858e995;p=php

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

diff --git a/NEWS b/NEWS
index 5f802d430e..16f0a10046 100644
--- a/NEWS
+++ b/NEWS
@@ -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)
 
 
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;
 		}
 	}