You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2014/02/11 21:38:44 UTC
svn commit: r1567366 - in /subversion/branches/1.8.x-r1567286: ./
subversion/libsvn_subr/sqlite.c
Author: breser
Date: Tue Feb 11 20:38:44 2014
New Revision: 1567366
URL: http://svn.apache.org/r1567366
Log:
On 1.8.x-r1567286 branch: Merge r1567286 from trunk, fixing conflicts
Modified:
subversion/branches/1.8.x-r1567286/ (props changed)
subversion/branches/1.8.x-r1567286/subversion/libsvn_subr/sqlite.c
Propchange: subversion/branches/1.8.x-r1567286/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1567286
Modified: subversion/branches/1.8.x-r1567286/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1567286/subversion/libsvn_subr/sqlite.c?rev=1567366&r1=1567365&r2=1567366&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1567286/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/branches/1.8.x-r1567286/subversion/libsvn_subr/sqlite.c Tue Feb 11 20:38:44 2014
@@ -902,6 +902,16 @@ svn_sqlite__open(svn_sqlite__db_t **db,
SVN_ERR(internal_open(&(*db)->db3, path, mode, scratch_pool));
+ /* disable SQLITE_ENABLE_STAT3/4 from 3.8.1 - 3.8.3 (but not 3.8.3.1+)
+ * to prevent using it when it's buggy.
+ * See: https://www.sqlite.org/src/info/4c86b126f2 */
+ if (sqlite3_libversion_number() > 3008000 &&
+ sqlite3_libversion_number() < 3008004 &&
+ strcmp(sqlite3_sourceid(),"2014-02-11")<0)
+ {
+ sqlite3_test_control(SQLITE_TESTCTRL_OPTIMIZATIONS, (*db)->db3, 0x800);
+ }
+
#ifdef SQLITE3_DEBUG
sqlite3_trace((*db)->db3, sqlite_tracer, (*db)->db3);
#endif