Author: kpvdr
Date: 2008-10-29 13:50:05 -0400 (Wed, 29 Oct 2008)
New Revision: 2694
Modified:
store/trunk/cpp/rhel4-support/rhel4.patch
Log:
Update to rhel4 patch to get changes in previous BDB auto-restore fix back in sync with
patch file
Modified: store/trunk/cpp/rhel4-support/rhel4.patch
===================================================================
--- store/trunk/cpp/rhel4-support/rhel4.patch 2008-10-29 17:33:09 UTC (rev 2693)
+++ store/trunk/cpp/rhel4-support/rhel4.patch 2008-10-29 17:50:05 UTC (rev 2694)
@@ -253,11 +253,11 @@
AC_SUBST([WARNING_CFLAGS], [$COMPILER_FLAGS])
Index: lib/MessageStoreImpl.cpp
===================================================================
---- lib/MessageStoreImpl.cpp (revision 2259)
+--- lib/MessageStoreImpl.cpp (revision 2693)
+++ lib/MessageStoreImpl.cpp (working copy)
-@@ -233,10 +233,6 @@
- try {
- env.open(getBdbBaseDir().c_str(), DB_THREAD | DB_CREATE | DB_INIT_TXN |
DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_USE_ENVIRON, 0);
+@@ -282,10 +282,6 @@
+ env.set_lg_regionmax(256000); // default = 65000
+ env.open(getBdbBaseDir().c_str(), DB_THREAD | DB_CREATE | DB_INIT_TXN |
DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_USE_ENVIRON | DB_RECOVER, 0);
} catch (const DbException& e) {
- if (e.get_errno() == DB_VERSION_MISMATCH)
- THROW_STORE_EXCEPTION_2("Database environment mismatch: This version of
bd4 does not match that which created the store database. "
@@ -265,7 +265,7 @@
- "db_upgrade or using db_recover - but the
db4-utils package must also be installed to use these utilities.)", e);
THROW_STORE_EXCEPTION_2("Error opening environment", e);
}
-
+
Index: Makefile.am
===================================================================
--- Makefile.am (revision 2259)