Author: danielsh
Date: Wed Jun 29 15:22:38 2011
New Revision: 1141133

URL: http://svn.apache.org/viewvc?rev=1141133&view=rev
Log:
* subversion/libsvn_subr/sqlite.c
  (svn_sqlite__open):
    Only enable the workaround when we are compiled against SQLite 3.7.7.x
    and earlier.  This should be safe since the version of SQLite at run-time
    cannot be older than the version at compile-time.

Modified:
    subversion/trunk/subversion/libsvn_subr/sqlite.c

Modified: subversion/trunk/subversion/libsvn_subr/sqlite.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sqlite.c?rev=1141133&r1=1141132&r2=1141133&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sqlite.c Wed Jun 29 15:22:38 2011
@@ -914,7 +914,7 @@ svn_sqlite__open(svn_sqlite__db_t **db, 
   sqlite3_profile((*db)->db3, sqlite_profiler, (*db)->db3);
 #endif
 
-  /* Work around a bug in SQLite 3.7.7.
+  /* Work around a bug in SQLite 3.7.7.  The bug was fixed in SQLite 3.7.7.1.
 
      See:
 
@@ -927,7 +927,7 @@ svn_sqlite__open(svn_sqlite__db_t **db, 
    */
   {
     int ignored_err = SQLITE_OK;
-#ifdef SQLITE_SCHEMA
+#if !SQLITE_VERSION_AT_LEAST(3,7,8) && defined(SQLITE_SCHEMA)
     if (!strcmp(sqlite3_libversion(), "3.7.7"))
       ignored_err = SQLITE_SCHEMA;
 #endif


Reply via email to