Import SQLite 3.8.7.4.

third_party/sqlite/patches/0006-Virtual-table-supporting-recovery-of-corrupted-datab.patch

Index: third_party/sqlite/patches/0006-Virtual-table-supporting-recovery-of-corrupted-datab.patch
diff --git a/third_party/sqlite/patches/0008-Virtual-table-supporting-recovery-of-corrupted-datab.patch b/third_party/sqlite/patches/0006-Virtual-table-supporting-recovery-of-corrupted-datab.patch
similarity index 99%
rename from third_party/sqlite/patches/0008-Virtual-table-supporting-recovery-of-corrupted-datab.patch
rename to third_party/sqlite/patches/0006-Virtual-table-supporting-recovery-of-corrupted-datab.patch
index 5bcaf5ae52072d10f1ea33b19b51a8691404d4b1..24fcbcf6759996d5b14a9dcd70cb8fe042195369 100644
--- a/third_party/sqlite/patches/0008-Virtual-table-supporting-recovery-of-corrupted-datab.patch
+++ b/third_party/sqlite/patches/0006-Virtual-table-supporting-recovery-of-corrupted-datab.patch
@@ -1,7 +1,7 @@
-From dc2d5db3e20e8aa8f3f34640b605dfa88576c19c Mon Sep 17 00:00:00 2001
+From 13a64d3c7fb541be8cb753c575837c1b84f5d9fd Mon Sep 17 00:00:00 2001
 From: Scott Hess <shess@chromium.org>
 Date: Sat, 20 Jul 2013 11:42:21 -0700
-Subject: [PATCH 08/23] Virtual table supporting recovery of corrupted
+Subject: [PATCH 06/16] Virtual table supporting recovery of corrupted
  databases.
 
 "recover" implements a virtual table which uses the SQLite pager layer
@@ -34,10 +34,10 @@ third_party/sqlite/src/src/{recover,recover-alt}.c .
  create mode 100644 third_party/sqlite/src/test/recover2.test
 
 diff --git a/third_party/sqlite/src/Makefile.in b/third_party/sqlite/src/Makefile.in
-index f3239f3..216742c 100644
+index a2213e8..1389486 100644
 --- a/third_party/sqlite/src/Makefile.in
 +++ b/third_party/sqlite/src/Makefile.in
-@@ -251,6 +251,7 @@ SRC = \
+@@ -253,6 +253,7 @@ SRC = \
    $(TOP)/src/prepare.c \
    $(TOP)/src/printf.c \
    $(TOP)/src/random.c \
@@ -61,19 +61,19 @@ index 554bf56..e631816 100644
  #    Nothing for unix.
  #
 diff --git a/third_party/sqlite/src/main.mk b/third_party/sqlite/src/main.mk
-index b0aa4b2..65dd690 100644
+index dc56b0d..2189fd6 100644
 --- a/third_party/sqlite/src/main.mk
 +++ b/third_party/sqlite/src/main.mk
-@@ -62,7 +62,7 @@ LIBOBJ+= alter.o analyze.o attach.o auth.o \
-          mutex.o mutex_noop.o mutex_os2.o mutex_unix.o mutex_w32.o \
-          notify.o opcodes.o os.o os_os2.o os_unix.o os_win.o \
-          pager.o parse.o pcache.o pcache1.o pragma.o prepare.o printf.o \
+@@ -65,7 +65,7 @@ LIBOBJ+= vdbe.o parse.o \
+          mutex.o mutex_noop.o mutex_unix.o mutex_w32.o \
+          notify.o opcodes.o os.o os_unix.o os_win.o \
+          pager.o pcache.o pcache1.o pragma.o prepare.o printf.o \
 -         random.o resolve.o rowset.o rtree.o select.o status.o \
 +         random.o recover.o resolve.o rowset.o rtree.o select.o status.o \
-          table.o tokenize.o trigger.o \
-          update.o util.o vacuum.o \
-          vdbe.o vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o vdbetrace.o \
-@@ -132,6 +132,7 @@ SRC = \
+          table.o threads.o tokenize.o trigger.o \
+          update.o userauth.o util.o vacuum.o \
+          vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o vdbesort.o \
+@@ -135,6 +135,7 @@ SRC = \
    $(TOP)/src/prepare.c \
    $(TOP)/src/printf.c \
    $(TOP)/src/random.c \
@@ -81,7 +81,7 @@ index b0aa4b2..65dd690 100644
    $(TOP)/src/resolve.c \
    $(TOP)/src/rowset.c \
    $(TOP)/src/select.c \
-@@ -284,6 +285,7 @@ TESTSRC2 = \
+@@ -315,6 +316,7 @@ TESTSRC2 = \
    $(TOP)/src/prepare.c \
    $(TOP)/src/printf.c \
    $(TOP)/src/random.c \
@@ -90,10 +90,10 @@ index b0aa4b2..65dd690 100644
    $(TOP)/src/pcache1.c \
    $(TOP)/src/select.c \
 diff --git a/third_party/sqlite/src/src/main.c b/third_party/sqlite/src/src/main.c
-index 4aaa618..696de1c 100644
+index fc03700..d15ab9bb 100644
 --- a/third_party/sqlite/src/src/main.c
 +++ b/third_party/sqlite/src/src/main.c
-@@ -1996,6 +1996,14 @@ static int openDatabase(
+@@ -2644,6 +2644,14 @@ static int openDatabase(
    }
  #endif
  
@@ -2279,11 +2279,11 @@ index 0000000..c996d53
 +  return SQLITE_OK;
 +}
 diff --git a/third_party/sqlite/src/src/sqlite.h.in b/third_party/sqlite/src/src/sqlite.h.in
-index ec7e502..00c8510 100644
+index f1d4e40..28b5ef1 100644
 --- a/third_party/sqlite/src/src/sqlite.h.in
 +++ b/third_party/sqlite/src/src/sqlite.h.in
-@@ -6388,6 +6388,17 @@ int sqlite3_wal_checkpoint_v2(
- #define SQLITE_CHECKPOINT_RESTART 2
+@@ -7408,6 +7408,17 @@ int sqlite3_vtab_on_conflict(sqlite3 *);
+ 
  
  
 +/* Begin recover.patch for Chromium */
@@ -3590,10 +3590,10 @@ index 0000000..8aa4e04
 +
 +finish_test
 diff --git a/third_party/sqlite/src/tool/mksqlite3c.tcl b/third_party/sqlite/src/tool/mksqlite3c.tcl
-index fa99f2d..df2df07 100644
+index 0e97923..9e2b0fe 100644
 --- a/third_party/sqlite/src/tool/mksqlite3c.tcl
 +++ b/third_party/sqlite/src/tool/mksqlite3c.tcl
-@@ -293,6 +293,8 @@ foreach file {
+@@ -316,6 +316,8 @@ foreach file {
     main.c
     notify.c