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

Unified Diff: third_party/sqlite/patches/0012-fts2-backport-ICU-tokenizer-iterate-by-UTF16.patch

Issue 901033002: Import SQLite 3.8.7.4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Chromium changes to support SQLite 3.8.7.4. Created 5 years, 10 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/0012-fts2-backport-ICU-tokenizer-iterate-by-UTF16.patch
diff --git a/third_party/sqlite/patches/0018-fts2-backport-ICU-tokenizer-iterate-by-UTF16.patch b/third_party/sqlite/patches/0012-fts2-backport-ICU-tokenizer-iterate-by-UTF16.patch
similarity index 84%
rename from third_party/sqlite/patches/0018-fts2-backport-ICU-tokenizer-iterate-by-UTF16.patch
rename to third_party/sqlite/patches/0012-fts2-backport-ICU-tokenizer-iterate-by-UTF16.patch
index f90284a7a00d178344d4c9af205d5deea19a33d5..b7ce0fdd2a73b21582535e1b79aaf0a8da47b1f9 100644
--- a/third_party/sqlite/patches/0018-fts2-backport-ICU-tokenizer-iterate-by-UTF16.patch
+++ b/third_party/sqlite/patches/0012-fts2-backport-ICU-tokenizer-iterate-by-UTF16.patch
@@ -1,7 +1,7 @@
-From 51baa7fbc6f2ee659f75e66d6fb9e3b7afdf42f5 Mon Sep 17 00:00:00 2001
+From 087238f08e5ba1e3651e36d37709ed8ce41b2679 Mon Sep 17 00:00:00 2001
From: Scott Hess <shess@chromium.org>
Date: Fri, 9 Jan 2015 11:27:59 -0800
-Subject: [PATCH 18/23] [fts2][backport] ICU tokenizer iterate by UTF16.
+Subject: [PATCH 12/16] [fts2][backport] ICU tokenizer iterate by UTF16.
This issue was discovered in Gears and is upstream at:
http://www.sqlite.org/src/info/892b74116a
@@ -12,7 +12,7 @@ No original review URL because this was part of the initial Chromium commit.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/sqlite/src/ext/fts2/fts2_icu.c b/third_party/sqlite/src/ext/fts2/fts2_icu.c
-index de8e116..6b9687e 100644
+index 2670301..6b6b195 100644
--- a/third_party/sqlite/src/ext/fts2/fts2_icu.c
+++ b/third_party/sqlite/src/ext/fts2/fts2_icu.c
@@ -198,7 +198,7 @@ static int icuNext(

Powered by Google App Engine
This is Rietveld 408576698