summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2010-06-01 15:18:00 -0700
committerMark Spruiell <mes@zeroc.com>2010-06-01 15:18:00 -0700
commitd126084328fc7c7adbe807b58cb91018a9d5e52a (patch)
treea66d238a4a93d4282e9a7e91bf3fd26e0f2ff7d7
parentFix TestUtil for VS2010 installations (diff)
downloadice-d126084328fc7c7adbe807b58cb91018a9d5e52a.tar.bz2
ice-d126084328fc7c7adbe807b58cb91018a9d5e52a.tar.xz
ice-d126084328fc7c7adbe807b58cb91018a9d5e52a.zip
fixing FreezeScript database flags
-rwxr-xr-xcpp/src/FreezeScript/DumpDB.cpp2
-rwxr-xr-xcpp/src/FreezeScript/transformdb.cpp4
-rwxr-xr-xcpp/test/FreezeScript/dbmap/run.py2
-rwxr-xr-xcpp/test/FreezeScript/evictor/run.py2
4 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp
index 5f4b2175bc7..c868e4e9000 100755
--- a/cpp/src/FreezeScript/DumpDB.cpp
+++ b/cpp/src/FreezeScript/DumpDB.cpp
@@ -494,7 +494,7 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator
// Open the database environment and start a transaction.
//
{
- u_int32_t flags = 0;
+ u_int32_t flags = DB_THREAD | DB_CREATE | DB_INIT_TXN | DB_INIT_MPOOL;
dbEnv.open(dbEnvName.c_str(), flags, FREEZE_SCRIPT_DB_MODE);
}
diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp
index 384f6357096..b0e7da96127 100755
--- a/cpp/src/FreezeScript/transformdb.cpp
+++ b/cpp/src/FreezeScript/transformdb.cpp
@@ -753,10 +753,10 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator
// DB_THREAD is for compatibility with Freeze (the catalog)
//
{
- u_int32_t flags = DB_THREAD;
+ u_int32_t flags = DB_THREAD | DB_CREATE | DB_INIT_TXN | DB_INIT_MPOOL;
if(catastrophicRecover)
{
- flags |= DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | DB_CREATE | DB_RECOVER_FATAL;
+ flags |= DB_INIT_LOG | DB_RECOVER_FATAL;
}
dbEnv.open(dbEnvName.c_str(), flags, FREEZE_SCRIPT_DB_MODE);
}
diff --git a/cpp/test/FreezeScript/dbmap/run.py b/cpp/test/FreezeScript/dbmap/run.py
index 4217ac54a0f..9001c8b54c0 100755
--- a/cpp/test/FreezeScript/dbmap/run.py
+++ b/cpp/test/FreezeScript/dbmap/run.py
@@ -111,7 +111,7 @@ checkxml = os.path.join(os.getcwd(), "check.xml")
print "initializing test database...",
sys.stdout.flush()
-command = '"' + transformdb + '" -c --old "' + testold + '" --new "' + testold + '" -f "' + initxml + '" "' + dbdir + \
+command = '"' + transformdb + '" --old "' + testold + '" --new "' + testold + '" -f "' + initxml + '" "' + dbdir + \
'" default.db "' + init_dbdir + '" '
TestUtil.spawn(command).waitTestSuccess()
diff --git a/cpp/test/FreezeScript/evictor/run.py b/cpp/test/FreezeScript/evictor/run.py
index e722a4ea3c8..085b96ef212 100755
--- a/cpp/test/FreezeScript/evictor/run.py
+++ b/cpp/test/FreezeScript/evictor/run.py
@@ -54,7 +54,7 @@ checkxml = os.path.join(os.getcwd(), "check.xml")
print "executing evictor transformations...",
sys.stdout.flush()
-command = '"' + transformdb + '" -c -e -p --old "' + testold + '" --new "' + testnew + '" -f "' + transformxml + '" "' + dbdir + \
+command = '"' + transformdb + '" -e -p --old "' + testold + '" --new "' + testnew + '" -f "' + transformxml + '" "' + dbdir + \
'" evictor.db "' + check_dbdir + '" '
proc = TestUtil.spawn(command)
proc.waitTestSuccess()