Import SQLite 3.10.2.

third_party/sqlite/patches/0006-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch

-From c7020c4c8f2e786436804819d11ca2e4b9878a5f Mon Sep 17 00:00:00 2001
+From a00fdd7ed25829eb5489907fc1e4a43429e0b621 Mon Sep 17 00:00:00 2001
 From: "tc@google.com" <tc@google.com>
 Date: Tue, 6 Jan 2009 22:39:41 +0000
-Subject: [PATCH 07/16] Custom shell.c helpers to load Chromium's ICU data.
+Subject: [PATCH 06/10] Custom shell.c helpers to load Chromium's ICU data.
 
 History uses fts3 with an icu-based segmenter.  These changes allow building a
 sqlite3 binary for Linux or Windows which can read those files.
 
 Original review URL: https://codereview.chromium.org/42250
 ---
  third_party/sqlite/src/Makefile.linux-gcc    |  7 ++++++
  third_party/sqlite/src/main.mk               |  2 +-
  third_party/sqlite/src/src/shell.c           | 10 +++++++++
  third_party/sqlite/src/src/shell_icu_linux.c | 27 +++++++++++++++++++++++
  third_party/sqlite/src/src/shell_icu_win.c   | 32 ++++++++++++++++++++++++++++
  5 files changed, 77 insertions(+), 1 deletion(-)
  create mode 100644 third_party/sqlite/src/src/shell_icu_linux.c
  create mode 100644 third_party/sqlite/src/src/shell_icu_win.c
 
 diff --git a/third_party/sqlite/src/Makefile.linux-gcc b/third_party/sqlite/src/Makefile.linux-gcc
-index e631816..f60f1a1 100644
+index f6291c0..17c9e00 100644
 --- a/third_party/sqlite/src/Makefile.linux-gcc
 +++ b/third_party/sqlite/src/Makefile.linux-gcc
-@@ -86,6 +86,13 @@ OPTS += -DOS_UNIX=1
+@@ -85,6 +85,13 @@ OPTS += -DOS_UNIX=1
  # purposes.
  OPTS += -DDEFAULT_ENABLE_RECOVER=1
  
 +# Support for loading Chromium ICU data in sqlite3.
 +ifeq ($(shell uname -s),Darwin)
 +SHELL_ICU =
 +else
 +SHELL_ICU = $(TOP)/src/shell_icu_linux.c -licuuc
 +endif
 +
  #### The suffix to add to executable files.  ".exe" for windows.
  #    Nothing for unix.
  #
 diff --git a/third_party/sqlite/src/main.mk b/third_party/sqlite/src/main.mk
-index 2189fd6..54b5b35 100644
+index a8629aa..4a6d5d6 100644
 --- a/third_party/sqlite/src/main.mk
 +++ b/third_party/sqlite/src/main.mk
-@@ -395,7 +395,7 @@ libsqlite3.a:       $(LIBOBJ)
+@@ -476,7 +476,7 @@ libsqlite3.a:       $(LIBOBJ)
  
  sqlite3$(EXE): $(TOP)/src/shell.c libsqlite3.a sqlite3.h
-        $(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE)                  \
--               $(TOP)/src/shell.c                                  \
-+               $(TOP)/src/shell.c $(SHELL_ICU)                     \
-                libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
+        $(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) $(SHELL_OPT) \
+-               $(TOP)/src/shell.c libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
++               $(TOP)/src/shell.c $(SHELL_ICU) libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
  
- mptester$(EXE):        sqlite3.c $(TOP)/mptest/mptest.c
+ sqldiff$(EXE): $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h
+        $(TCCX) -o sqldiff$(EXE) -DSQLITE_THREADSAFE=0 \
 diff --git a/third_party/sqlite/src/src/shell.c b/third_party/sqlite/src/src/shell.c
-index 3ca4b09..0951481 100644
+index b7a7abc..b1d5087 100644
 --- a/third_party/sqlite/src/src/shell.c
 +++ b/third_party/sqlite/src/src/shell.c
-@@ -3963,6 +3963,16 @@ int main(int argc, char **argv){
-   signal(SIGINT, interrupt_handler);
+@@ -4645,6 +4645,16 @@ int SQLITE_CDECL main(int argc, char **argv){
+   }
  #endif
  
 +  /* Begin evanm patch. */
 +#if !defined(__APPLE__)
 +  extern int sqlite_shell_init_icu();
 +  if( !sqlite_shell_init_icu() ){
 +    fprintf(stderr, "%s: warning: couldn't find icudt38.dll; "
 +                    "queries against ICU FTS tables will fail.\n", argv[0]);
 +  }
 +#endif /* !defined(__APPLE__) */
@@ skipping 67 matching lines @@
 +  addr = GetProcAddress(module, ICU_DATA_SYMBOL);
 +  if (!addr)
 +    return 0;
 +
 +  err = U_ZERO_ERROR;
 +  udata_setCommonData(addr, &err);
 +
 +  return 1;
 +}
 -- 
-2.2.1
+2.7.0