Update sqlite3 to 3.8.7.4. Changes available here: http://sqlite.org/changes.html#version_3_8_7_4

ok landry@

7 files changed, 15 insertions, 6 deletions

diff --git a/lib/libsqlite3/tool/mkautoconfamal.sh b/lib/libsqlite3/tool/mkautoconfamal.sh
index c13f7c999ad..4829277234b 100644
--- a/lib/libsqlite3/tool/mkautoconfamal.sh
+++ b/lib/libsqlite3/tool/mkautoconfamal.sh
@@ -62,7 +62,7 @@ mkdir -p tea/generic
 echo "#ifdef USE_SYSTEM_SQLITE"      > tea/generic/tclsqlite3.c 
 echo "# include <sqlite3.h>"        >> tea/generic/tclsqlite3.c
 echo "#else"                        >> tea/generic/tclsqlite3.c
-echo "#include \"../../sqlite3.c\"" >> tea/generic/tclsqlite3.c
+echo "#include \"sqlite3.c\""       >> tea/generic/tclsqlite3.c
 echo "#endif"                       >> tea/generic/tclsqlite3.c
 cat  $TOP/src/tclsqlite.c           >> tea/generic/tclsqlite3.c
 
diff --git a/lib/libsqlite3/tool/mkpragmatab.tcl b/lib/libsqlite3/tool/mkpragmatab.tcl
index 28a1e468b89..aa7c8078c55 100644
--- a/lib/libsqlite3/tool/mkpragmatab.tcl
+++ b/lib/libsqlite3/tool/mkpragmatab.tcl
@@ -294,6 +294,8 @@ set pragma_def {
   IF:   defined(SQLITE_HAS_CODEC) || defined(SQLITE_ENABLE_CEROD)
 
   NAME: soft_heap_limit
+
+  NAME: threads
 }
 fconfigure stdout -translation lf
 set name {}
diff --git a/lib/libsqlite3/tool/mksqlite3c-noext.tcl b/lib/libsqlite3/tool/mksqlite3c-noext.tcl
index ecb9cb0439c..f54b347be14 100644
--- a/lib/libsqlite3/tool/mksqlite3c-noext.tcl
+++ b/lib/libsqlite3/tool/mksqlite3c-noext.tcl
@@ -239,6 +239,7 @@ foreach file {
    malloc.c
    printf.c
    random.c
+   threads.c
    utf.c
    util.c
    hash.c
diff --git a/lib/libsqlite3/tool/mksqlite3c.tcl b/lib/libsqlite3/tool/mksqlite3c.tcl
index 64207727be2..0e979234f32 100644
--- a/lib/libsqlite3/tool/mksqlite3c.tcl
+++ b/lib/libsqlite3/tool/mksqlite3c.tcl
@@ -253,6 +253,7 @@ foreach file {
    malloc.c
    printf.c
    random.c
+   threads.c
    utf.c
    util.c
    hash.c
diff --git a/lib/libsqlite3/tool/showdb.c b/lib/libsqlite3/tool/showdb.c
index 1a51e9d1a2a..82b8c9f14f9 100644
--- a/lib/libsqlite3/tool/showdb.c
+++ b/lib/libsqlite3/tool/showdb.c
@@ -957,7 +957,7 @@ static void usage(const char *argv0){
     "    NNNbdCCC        Decode cell CCC on btree page NNN\n"
     "    NNNt            Decode freelist trunk page NNN\n"
     "    NNNtd           Show leaf freelist pages on the decode\n"
-    "    NNNtr           Recurisvely decode freelist starting at NNN\n"
+    "    NNNtr           Recursively decode freelist starting at NNN\n"
   );
 }
 
diff --git a/lib/libsqlite3/tool/showwal.c b/lib/libsqlite3/tool/showwal.c
index 6dc1de173f3..35810c66a96 100644
--- a/lib/libsqlite3/tool/showwal.c
+++ b/lib/libsqlite3/tool/showwal.c
@@ -510,7 +510,7 @@ static void decode_btree_page(
 
 int main(int argc, char **argv){
   struct stat sbuf;
-  unsigned char zPgSz[2];
+  unsigned char zPgSz[4];
   if( argc<2 ){
     fprintf(stderr,"Usage: %s FILENAME ?PAGE? ...\n", argv[0]);
     exit(1);
@@ -522,9 +522,9 @@ int main(int argc, char **argv){
   }
   zPgSz[0] = 0;
   zPgSz[1] = 0;
-  lseek(fd, 10, SEEK_SET);
-  read(fd, zPgSz, 2);
-  pagesize = zPgSz[0]*256 + zPgSz[1];
+  lseek(fd, 8, SEEK_SET);
+  read(fd, zPgSz, 4);
+  pagesize = zPgSz[1]*65536 + zPgSz[2]*256 + zPgSz[3];
   if( pagesize==0 ) pagesize = 1024;
   printf("Pagesize: %d\n", pagesize);
   fstat(fd, &sbuf);
diff --git a/lib/libsqlite3/tool/vdbe-compress.tcl b/lib/libsqlite3/tool/vdbe-compress.tcl
index a349830bcf5..9477f4afe62 100644
--- a/lib/libsqlite3/tool/vdbe-compress.tcl
+++ b/lib/libsqlite3/tool/vdbe-compress.tcl
@@ -110,6 +110,11 @@ while {![eof stdin]} {
     foreach v $vlist {
       regsub -all "(\[^a-zA-Z0-9>.\])${v}(\\W)" $line "\\1u.$sname.$v\\2" line
       regsub -all "(\[^a-zA-Z0-9>.\])${v}(\\W)" $line "\\1u.$sname.$v\\2" line
+
+      # The expressions above fail to catch instance of variable "abc" in
+      # expressions like (32>abc). The following expression makes those
+      # substitutions.
+      regsub -all "(\[^-\])>${v}(\\W)" $line "\\1>u.$sname.$v\\2" line
     }
     append afterUnion [string trimright $line]\n
   } elseif {$line=="" && [eof stdin]} {