From 1191b4467d244b507775c775ee78a45a19c679a8 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Thu, 21 Jan 2016 08:53:39 -0500 Subject: [PATCH] Bug 1241121 - Upgrade SQLite to version 3.10.2. r=mak --- configure.in | 2 +- db/sqlite3/src/sqlite3.c | 20 ++++++++++++-------- db/sqlite3/src/sqlite3.h | 6 +++--- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/configure.in b/configure.in index 965151b8e19..ff39963733a 100644 --- a/configure.in +++ b/configure.in @@ -75,7 +75,7 @@ GNOMEUI_VERSION=2.2.0 GCONF_VERSION=1.2.1 STARTUP_NOTIFICATION_VERSION=0.8 DBUS_VERSION=0.60 -SQLITE_VERSION=3.10.1 +SQLITE_VERSION=3.10.2 MSMANIFEST_TOOL= diff --git a/db/sqlite3/src/sqlite3.c b/db/sqlite3/src/sqlite3.c index af72b701eaf..c0ab2337e6c 100644 --- a/db/sqlite3/src/sqlite3.c +++ b/db/sqlite3/src/sqlite3.c @@ -1,6 +1,6 @@ /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.10.1. By combining all the individual C code files into this +** version 3.10.2. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a single translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -325,9 +325,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.10.1" -#define SQLITE_VERSION_NUMBER 3010001 -#define SQLITE_SOURCE_ID "2016-01-13 21:41:56 254419c36766225ca542ae873ed38255e3fb8588" +#define SQLITE_VERSION "3.10.2" +#define SQLITE_VERSION_NUMBER 3010002 +#define SQLITE_SOURCE_ID "2016-01-20 15:27:19 17efb4209f97fb4971656086b138599a91a75ff9" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -49045,7 +49045,7 @@ SQLITE_PRIVATE int sqlite3PagerBegin(Pager *pPager, int exFlag, int subjInMemory if( rc!=SQLITE_OK ){ return rc; } - sqlite3WalExclusiveMode(pPager->pWal, 1); + (void)sqlite3WalExclusiveMode(pPager->pWal, 1); } /* Grab the write lock on the log file. If successful, upgrade to @@ -50115,7 +50115,11 @@ SQLITE_PRIVATE sqlite3_file *sqlite3PagerFile(Pager *pPager){ ** This will be either the rollback journal or the WAL file. */ SQLITE_PRIVATE sqlite3_file *sqlite3PagerJrnlFile(Pager *pPager){ +#if SQLITE_OMIT_WAL + return pPager->jfd; +#else return pPager->pWal ? sqlite3WalFile(pPager->pWal) : pPager->jfd; +#endif } /* @@ -100279,7 +100283,7 @@ static int patternCompare( } c2 = Utf8Read(zString); if( c==c2 ) continue; - if( noCase && sqlite3Tolower(c)==sqlite3Tolower(c2) ){ + if( noCase && c<0x80 && c2<0x80 && sqlite3Tolower(c)==sqlite3Tolower(c2) ){ continue; } if( c==matchOne && zPattern!=zEscaped && c2!=0 ) continue; @@ -135026,7 +135030,6 @@ static int openDatabase( sqlite3_wal_autocheckpoint(db, SQLITE_DEFAULT_WAL_AUTOCHECKPOINT); opendb_out: - sqlite3_free(zOpen); if( db ){ assert( db->mutex!=0 || isThreadsafe==0 || sqlite3GlobalConfig.bFullMutex==0 ); @@ -135063,6 +135066,7 @@ opendb_out: } } #endif + sqlite3_free(zOpen); return rc & 0xff; } @@ -182280,7 +182284,7 @@ static void fts5SourceIdFunc( sqlite3_value **apVal /* Function arguments */ ){ assert( nArg==0 ); - sqlite3_result_text(pCtx, "fts5: 2016-01-13 21:41:56 254419c36766225ca542ae873ed38255e3fb8588", -1, SQLITE_TRANSIENT); + sqlite3_result_text(pCtx, "fts5: 2016-01-20 15:27:19 17efb4209f97fb4971656086b138599a91a75ff9", -1, SQLITE_TRANSIENT); } static int fts5Init(sqlite3 *db){ diff --git a/db/sqlite3/src/sqlite3.h b/db/sqlite3/src/sqlite3.h index 2df20623eb3..c6d1e0f233b 100644 --- a/db/sqlite3/src/sqlite3.h +++ b/db/sqlite3/src/sqlite3.h @@ -111,9 +111,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.10.1" -#define SQLITE_VERSION_NUMBER 3010001 -#define SQLITE_SOURCE_ID "2016-01-13 21:41:56 254419c36766225ca542ae873ed38255e3fb8588" +#define SQLITE_VERSION "3.10.2" +#define SQLITE_VERSION_NUMBER 3010002 +#define SQLITE_SOURCE_ID "2016-01-20 15:27:19 17efb4209f97fb4971656086b138599a91a75ff9" /* ** CAPI3REF: Run-Time Library Version Numbers