Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(225)

Unified Diff: third_party/sqlite/patches/0008-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch

Issue 2751253002: [sql] Import SQLite 3.17.0. (Closed)
Patch Set: also clang on Linux i386 Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/sqlite/patches/0008-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch
diff --git a/third_party/sqlite/patches/0009-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch b/third_party/sqlite/patches/0008-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch
similarity index 79%
rename from third_party/sqlite/patches/0009-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch
rename to third_party/sqlite/patches/0008-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch
index fbc73b21632ca97c0357efae34d8024ec20a943b..358d9fb4298b1b045310dbfddf65342de483c44d 100644
--- a/third_party/sqlite/patches/0009-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch
+++ b/third_party/sqlite/patches/0008-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch
@@ -1,7 +1,7 @@
-From 68cc26624a8e4fbbf0d41ac95269739920d11472 Mon Sep 17 00:00:00 2001
+From e007f424af863cda23f578906426d32f06e5c9cb Mon Sep 17 00:00:00 2001
From: Scott Hess <shess@chromium.org>
Date: Thu, 12 Feb 2015 15:01:26 -0800
-Subject: [PATCH 09/10] [fts3] Fix uninit variable in fts3EvalDeferredPhrase.
+Subject: [PATCH 08/10] [fts3] Fix uninit variable in fts3EvalDeferredPhrase.
Chromium compiles with SQLITE_DISABLE_FTS4_DEFERRED since fts4 is
disabled. That compiles away sqlite3Fts3DeferredTokenList() which
@@ -14,10 +14,10 @@ R=thakis@chromium.org
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/third_party/sqlite/src/ext/fts3/fts3.c b/third_party/sqlite/src/ext/fts3/fts3.c
-index 8f15099..a8d16a9 100644
+index 4b032271148e..2a24b78f3783 100644
--- a/third_party/sqlite/src/ext/fts3/fts3.c
+++ b/third_party/sqlite/src/ext/fts3/fts3.c
-@@ -4149,8 +4149,8 @@ static int fts3EvalDeferredPhrase(Fts3Cursor *pCsr, Fts3Phrase *pPhrase){
+@@ -4171,8 +4171,8 @@ static int fts3EvalDeferredPhrase(Fts3Cursor *pCsr, Fts3Phrase *pPhrase){
Fts3DeferredToken *pDeferred = pToken->pDeferred;
if( pDeferred ){
@@ -29,5 +29,5 @@ index 8f15099..a8d16a9 100644
if( rc!=SQLITE_OK ) return rc;
--
-2.7.0
+2.11.0

Powered by Google App Engine
This is Rietveld 408576698