Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: neutral (athena.apache.org: local policy)
Subject: Re: Problem with checkout for 1.7.0-rc4
Mime-Version: 1.0 (Apple Message framework v1251.1)
Content-Type: text/plain; charset=us-ascii
From: Barry Scott <barry@barrys-emacs.org>
In-Reply-To: <87aa97j46m.fsf@stat.home.lan>
Date: Sun, 16 Oct 2011 20:59:40 +0100
Cc: Toby Peterson <toby@apple.com>,
 Bert Huijben <bert@qqmail.nl>,
 'Mark Phippard' <markphip@gmail.com>,
 'Subversion Development' <dev@subversion.apache.org>
Content-Transfer-Encoding: quoted-printable
Message-Id: <EDB3120C-BFAE-4C67-BC69-7711B3E40107@barrys-emacs.org>
References: <BA458F87-845B-499F-850D-5706DC2B58A7@barrys-emacs.org>
 <87aa98v3ik.fsf@stat.home.lan>
 <CAHFaGCo5Y=ueT1X2sXtrdF3J5av=p=jowpz+3YQx4xWsA-MQFQ@mail.gmail.com>
 <8762jwv25u.fsf@stat.home.lan> <008101cc87aa$2d72cc70$88586550$@qqmail.nl>
 <68D71CE2-D4E2-451D-A408-5409CF3B6FFA@apple.com>
 <87lisshqxb.fsf@stat.home.lan> <87aa97j46m.fsf@stat.home.lan>
To: Philip Martin <philip.martin@wandisco.com>


On 11 Oct 2011, at 09:57, Philip Martin wrote:

> Philip Martin <philip.martin@wandisco.com> writes:
>=20
>> sqlite-3.6.18, our minimum version, has SQLITE_OPEN_SHAREDCACHE.  I
>> suppose we could start using that instead of =
sqlite3_enable_shared_cache.
>=20
> Barry, would you try this patch to confirm it works on OS X 10.7:

Yes this patch works. Applies 133 lines offset against 1.7.0 tarball =
source.

With this in place my regressions test are passing for pysvn.

Thanks for your help.

Barry


>=20
> Index: subversion/libsvn_subr/sqlite.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- subversion/libsvn_subr/sqlite.c	(revision 1181650)
> +++ subversion/libsvn_subr/sqlite.c	(working copy)
> @@ -637,12 +637,6 @@
>=20
> #endif /* APR_HAS_THRADS */
>=20
> -  /* 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;
> }
>=20
> @@ -673,6 +667,11 @@
>     flags |=3D SQLITE_OPEN_NOMUTEX;
> #endif
>=20
> +    /* 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 |=3D 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. */
>=20
> --=20
> uberSVN: Apache Subversion Made Easy
> http://www.uberSVN.com
>=20