Greg Stein wrote:
> On Tue, Apr 14, 2009 at 20:42, Christian Boos <cboos_at_neuf.fr> wrote:
>
>> ...
>>
>>> >> ...
>>>
>>>> +++ trunk/subversion/libsvn_subr/sqlite.c Sun Apr 12 08:14:29 2009
>>>> (r37185)
>>>> @@ -597,8 +597,12 @@ init_sqlite(apr_pool_t *pool)
>>>> "thread-safe mode"));
>>>> #endif
>>>> #if SQLITE_VERSION_AT_LEAST(3,6,0)
>>>> - SQLITE_ERR_MSG(sqlite3_config(SQLITE_CONFIG_MULTITHREAD),
>>>> - "Could not configure SQLite");
>>>> + /* If SQLite has been already initialized, sqlite3_config() returns
>>>> + SQLITE_MISUSE. */
>>>> + int err = sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
>>>> + if (err != SQLITE_OK && err != SQLITE_MISUSE)
>>>> + return svn_error_create(SQLITE_ERROR_CODE(err), NULL,
>>>> + "Could not configure SQLite");
>>>> SQLITE_ERR_MSG(sqlite3_initialize(), "Could not initialize SQLite");
>>>> #endif
>>>> >
>>>>
>>> You'll need some braces in there for that variable declaration (can't
>>> (portably) declare the variable mid-block).
>>>
>>>
>> That fix is also needed for Trac, see http://trac.edgewall.org/ticket/8199
>> Would you please consider porting that change to the 1.6.x branch? Thanks!
>>
>
> Sure... it's already on track for backporting to 1.6.
Thanks! I've just looked at the STATUS file, it's indeed there but some
more votes are needed... Subversion developers caring about Trac, please
vote ;-)
-- Christian
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1724207
Received on 2009-04-15 11:03:09 CEST