Re: Problem with checkout for 1.7.0-rc4

Philip Martin <philip.martin_at_wandisco.com> writes:

> sqlite-3.6.18, our minimum version, has SQLITE_OPEN_SHAREDCACHE. I
> suppose we could start using that instead of sqlite3_enable_shared_cache.

Barry, would you try this patch to confirm it works on OS X 10.7:

Index: subversion/libsvn_subr/sqlite.c
===================================================================
--- subversion/libsvn_subr/sqlite.c (revision 1181650)
+++ subversion/libsvn_subr/sqlite.c (working copy)
@@ -637,12 +637,6 @@
 
 #endif /* APR_HAS_THRADS */
 
- /* SQLite 3.5 allows sharing cache instances, even in a multithreaded
- environment. This allows sharing cached data when we open a database
- more than once (Very common in the current pre-single-database state) */
- SQLITE_ERR_MSG(sqlite3_enable_shared_cache(TRUE),
- _("Could not initialize SQLite shared cache"));
-
   return SVN_NO_ERROR;
 }
 
@@ -673,6 +667,11 @@
     flags |= SQLITE_OPEN_NOMUTEX;
 #endif
 
+ /* SQLite 3.5 allows sharing cache instances, even in a multithreaded
+ environment. This allows sharing cached data when we open a database
+ more than once (Very common in the current pre-single-database state) */
+ flags |= SQLITE_OPEN_SHAREDCACHE;
+
     /* Open the database. Note that a handle is returned, even when an error
        occurs (except for out-of-memory); thus, we can safely use it to
        extract an error message and construct an svn_error_t. */

-- 
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com