You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/04/12 16:05:29 UTC
Re: svn commit: r37185 - trunk/subversion/libsvn_subr
On Sun, Apr 12, 2009 at 17:14, Arfrever Frehtes Taifersar Arahesis
<Ar...@gmail.com> 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).
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1671264
Re: svn commit: r37185 - trunk/subversion/libsvn_subr
Posted by Greg Stein <gs...@gmail.com>.
On Wed, Apr 15, 2009 at 11:02, Christian Boos <cb...@neuf.fr> wrote:
> Greg Stein wrote:
>> On Tue, Apr 14, 2009 at 20:42, Christian Boos <cb...@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 ;-)
Well... 1.6.2 is a couple weeks away, probably, so I bet people are
thinking "no need to rush and vote" :-P
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1725183
Re: svn commit: r37185 - trunk/subversion/libsvn_subr
Posted by Christian Boos <cb...@neuf.fr>.
Greg Stein wrote:
> On Tue, Apr 14, 2009 at 20:42, Christian Boos <cb...@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
Re: svn commit: r37185 - trunk/subversion/libsvn_subr
Posted by Greg Stein <gs...@gmail.com>.
On Tue, Apr 14, 2009 at 20:42, Christian Boos <cb...@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.2
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1714684
Re: svn commit: r37185 - trunk/subversion/libsvn_subr
Posted by Christian Boos <cb...@neuf.fr>.
Hello,
Greg Stein wrote:
> On Sun, Apr 12, 2009 at 17:14, Arfrever Frehtes Taifersar Arahesis
> <Ar...@gmail.com> 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!
-- Christian
PS: sorry Greg for the double post, as I didn't do a "Reply All" at first...
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1714565
Re: svn commit: r37185 - trunk/subversion/libsvn_subr
Posted by Arfrever Frehtes Taifersar Arahesis <Ar...@GMail.Com>.
2009-04-12 18:05:29 Greg Stein napisał(a):
> On Sun, Apr 12, 2009 at 17:14, Arfrever Frehtes Taifersar Arahesis
> <Ar...@gmail.com> 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).
Fixed in r37187.
--
Arfrever Frehtes Taifersar Arahesis