Merge the changes for the 3.11.0 release candidate from trunk.

FossilOrigin-Name: 4d7a802e73ef0352f840bc8d74c560afb7666ff7

diff --cc Makefile.in
index 3e77b123b3f3799e5c7291de28087b1adb73da45,013cf442d195b07e3ef42ed36dacf7b8d648f55c..1aec6d06c0a3bdbb76329aa66124186ca73c749e
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -1165,13 -1153,18 +1166,18 @@@ loadfts$(EXE): $(TOP)/tool/loadfts.c li
  # releasetest.tcl script.
  #
  checksymbols: sqlite3.lo
 -      nm -g --defined-only sqlite3.o | grep -v " sqlite3_" ; test $$? -ne 0
 +      nm -g --defined-only sqlite3.o | egrep -v ' sqlite3(changeset|session)?_' ; test $$? -ne 0
        echo '0 errors out of 1 tests'
  
- # Build the amalgamation-autoconf package.
+ # Build the amalgamation-autoconf package.  The amalamgation-tarball target builds
+ # a tarball named for the version number.  Ex:  sqlite-autoconf-3110000.tar.gz.
+ # The snapshot-tarball target builds a tarball named by the SHA1 hash
  #
  amalgamation-tarball: sqlite3.c
-       TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh
+       TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh --normal
+ 
+ snapshot-tarball: sqlite3.c
+       TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh --snapshot
  
  # The next two rules are used to support the "threadtest" target. Building
  # threadtest runs a few thread-safety tests that are implemented in C. This

diff --cc Makefile.msc
index 4ffe5c3620cae292e6cd2a1cdd2ff184e442a1fd,843f9a25379fd0e99b08c48c15a5bb889301f179..a3a1d52f79923f24b4f7e020624c8575d7ce2ac1
--- 1/Makefile.msc
--- 2/Makefile.msc
+++ b/Makefile.msc
@@@ -1157,13 -1158,8 +1169,11 @@@ SRC07 = 
    $(TOP)\ext\fts3\fts3_unicode.c \
    $(TOP)\ext\fts3\fts3_unicode2.c \
    $(TOP)\ext\fts3\fts3_write.c \
-   $(TOP)\ext\icu\sqliteicu.h \
    $(TOP)\ext\icu\icu.c \
-   $(TOP)\ext\rtree\rtree.h \
    $(TOP)\ext\rtree\rtree.c \
 +  $(TOP)\ext\session\sqlite3session.h \
 +  $(TOP)\ext\session\sqlite3session.c \
 +  $(TOP)\ext\rbu\sqlite3rbu.h \
    $(TOP)\ext\rbu\sqlite3rbu.c \
    $(TOP)\ext\misc\json1.c
  
@@@ -1227,10 -1247,9 +1261,10 @@@ TESTSRC = 
    $(TOP)\src\test_wsd.c \
    $(TOP)\ext\fts3\fts3_term.c \
    $(TOP)\ext\fts3\fts3_test.c \
 +  $(TOP)\ext\session\test_session.c \
    $(TOP)\ext\rbu\test_rbu.c
  
- # Statically linked extensions
+ # Statically linked extensions.
  #
  TESTEXT = \
    $(TOP)\ext\misc\amatch.c \
@@@ -1250,65 -1269,15 +1284,23 @@@
    $(TOP)\ext\misc\totype.c \
    $(TOP)\ext\misc\wholenumber.c
  
- 
  # Source code to the library files needed by the test fixture
 +# (non-amalgamation)
  #
  TESTSRC2 = \
-   $(TOP)\src\attach.c \
-   $(TOP)\src\backup.c \
-   $(TOP)\src\bitvec.c \
-   $(TOP)\src\btree.c \
-   $(TOP)\src\build.c \
-   $(TOP)\src\ctime.c \
-   $(TOP)\src\date.c \
-   $(TOP)\src\dbstat.c \
-   $(TOP)\src\expr.c \
-   $(TOP)\src\func.c \
-   $(TOP)\src\insert.c \
-   $(TOP)\src\wal.c \
-   $(TOP)\src\main.c \
-   $(TOP)\src\mem5.c \
-   $(TOP)\src\os.c \
-   $(TOP)\src\os_unix.c \
-   $(TOP)\src\os_win.c \
-   $(TOP)\src\pager.c \
-   $(TOP)\src\pragma.c \
-   $(TOP)\src\prepare.c \
-   $(TOP)\src\printf.c \
-   $(TOP)\src\random.c \
-   $(TOP)\src\pcache.c \
-   $(TOP)\src\pcache1.c \
-   $(TOP)\src\select.c \
-   $(TOP)\src\tokenize.c \
-   $(TOP)\src\utf.c \
-   $(TOP)\src\util.c \
-   $(TOP)\src\vdbeapi.c \
-   $(TOP)\src\vdbeaux.c \
-   $(TOP)\src\vdbe.c \
-   $(TOP)\src\vdbemem.c \
-   $(TOP)\src\vdbesort.c \
-   $(TOP)\src\vdbetrace.c \
-   $(TOP)\src\where.c \
-   $(TOP)\src\wherecode.c \
-   $(TOP)\src\whereexpr.c \
-   parse.c \
-   $(TOP)\ext\fts3\fts3.c \
-   $(TOP)\ext\fts3\fts3_aux.c \
-   $(TOP)\ext\fts3\fts3_expr.c \
-   $(TOP)\ext\fts3\fts3_tokenizer.c \
-   $(TOP)\ext\fts3\fts3_tokenize_vtab.c \
-   $(TOP)\ext\fts3\fts3_unicode.c \
-   $(TOP)\ext\fts3\fts3_unicode2.c \
-   $(TOP)\ext\fts3\fts3_write.c \
+   $(SRC00) \
+   $(SRC01) \
+   $(SRC06) \
+   $(SRC07) \
+   $(SRC10) \
 -  $(TOP)\ext\async\sqlite3async.c
 +  $(TOP)\ext\async\sqlite3async.c \
 +  $(TOP)\ext\session\sqlite3session.c
 +
 +# Source code to the library files needed by the test fixture
 +# (amalgamation)
 +#
 +TESTSRC3 =
 +
  
  # Header files used by all library source files.
  #
@@@ -1937,8 -1907,8 +1936,8 @@@ TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_
  TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE=""
  TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CORE $(NO_WARN)
  
- TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2) $(SHELL_CORE_DEP)
+ TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2)
 -TESTFIXTURE_SRC1 = $(TESTEXT) $(SQLITE3C)
 +TESTFIXTURE_SRC1 = $(TESTEXT) $(TESTSRC3) $(SQLITE3C)
  !IF $(USE_AMALGAMATION)==0
  TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC0)
  !ELSE

diff --cc main.mk
Simple merge

diff --cc manifest
index 50a3a7d14f6cac5d0969019aa9aaf475f47fa612,edbefc847e50aab816df07b170aed59346d2591f..3107e3477098917e33e1b297eac88758e45a9128
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\senhancements\sand\sfixes\sfrom\strunk.
- D 2016-02-09T15:44:18.735
- F Makefile.in f3616d877a83bca632307d8acd1d2247a462c6dd
 -C Fix\sa\spotential\sbuffer\soverread\sprovoked\sby\sinvalid\sutf-8\sin\sfts5.
 -D 2016-02-12T18:48:09.224
 -F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
++C Merge\sthe\schanges\sfor\sthe\s3.11.0\srelease\scandidate\sfrom\strunk.
++D 2016-02-13T14:07:56.771
++F Makefile.in 5cbf3f753328d1bcd3a6117785b4874d99612f8f
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 8bab27a620b140c06014463b5d0829b052073d02
 -F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347
++F Makefile.msc 45e596bd4ccecf2256f68a2e96466aa52cc4bc1f
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -292,7 -272,7 +292,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 21ff7c0fda5d0fade28e9ac2dff3e28097180528
 -F main.mk 791597b87204f6bd56cdf7b2ab2feeecd608c60d
++F main.mk 347535e93b4a3b65c2b73002fefc931308cd034b
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -329,7 -309,7 +329,7 @@@ F src/global.c bd5a0af3f30b0c01be6db756
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 76e3c2ffc598b7815e6a88b09b32416e1b1819fb
 -F src/insert.c 9ca97272e9f74ed0efddf3b4350ee12740cebbef
++F src/insert.c d53917351d0542ce2be88888dca6b0b076e46aaa
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c b1b0880fc474abfab89e737b0ecfde0bd7a60902
  F src/loadext.c 84996d7d70a605597d79c1f1d7b2012a5fd34f2b
@@@ -369,11 -349,11 +369,11 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c 9f7ce3a3c087afb7597b7c916c99126ff3f12f0c
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
  F src/select.c ff80004a9a6ece891a8d9327a88e7b6e2588ee6d
- F src/shell.c 01e109c27300379b1c35b254cd294cde635f0179
- F src/sqlite.h.in 301c01f7c514cbb9ff5110889ea24e1a9715edac
 -F src/shell.c 0367440658104bf2ce8d8a9a5a713a4b11c9acbe
 -F src/sqlite.h.in f80c6ebd85588fc514bfedf3ecb00cec269cb410
++F src/shell.c 8cb62662c93e75189a152c4896336f44f05ced28
++F src/sqlite.h.in 9a3a1ee60bd2681034a3b730ef1208268d00fcc8
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h f58219ec2bae2458f2ead1c6e187646a3c70594a
 -F src/sqliteInt.h 04ca5b3cdb3bcf87ba6300d5d36b51498f65f28c
++F src/sqliteInt.h a6127f268ee02e6f792e5d5706707a8dd9bf8808
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -429,7 -409,7 +429,7 @@@ F src/threads.c bbfb74450643cb5372a43ad
  F src/tokenize.c 813934be70597edfbb685ae08fc4c8b549cf5a1e
  F src/treeview.c dc39ccf04e9331237388b9cb73289c9d87ea050b
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
- F src/update.c 52552d2fe1bb66e7bdaedbd68e7dda1f5705bd44
 -F src/update.c a7eeeaffad59c6506f01303a071dac11de8269ca
++F src/update.c c0016d277a418360456ff6af29363effbd4272f7
  F src/utf.c 10cc2519e82e3369344d0969ad4b1a333dc86d18
  F src/util.c 49ce0a65306c1c51d61cb5bc214c71cb62452de6
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
@@@ -1412,10 -1391,10 +1412,10 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl f0d5bb266d1d388cf86fce5ba01a891e95d72d41
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
 -F tool/mksqlite3c.tcl b66b4170f693602cd6985aed15d9509fe2f18c84
 -F tool/mksqlite3h.tcl 1d41ab59bffb025121f75b76e183125ce41b3ec8
 +F tool/mksqlite3c.tcl a52d7e8c0888f9384fbfa2c6ddd5f357409758b9
 +F tool/mksqlite3h.tcl e7b106fc4f29fbc258e8ba9b88d9108332ea2ade
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
- F tool/mkvsix.tcl bbe57cd9ae11c6cc70319241101ef8d2b8c3765b
+ F tool/mkvsix.tcl fbeb0af7cffdf64e0fba6d65e2e5120dc14595f4
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
  F tool/pagesig.c ff0ca355fd3c2398e933da5e22439bbff89b803b
@@@ -1446,9 -1425,9 +1446,9 @@@ F tool/varint.c 5d94cb5003db9dbbcbcc5df
  F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
  F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
- F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
+ F tool/warnings.sh ef6ebc6fd8d2dc35db3b622015c16a023d4fef4f
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P a533608cb0de3cbc1e28a794aab99864b8c249f4 ca72be8618e5d466d6f35819ca8bbd2b84269959
- R d85e9a45ccd06fa00872d35eb5681210
 -P 130580207ab5cee762b2893808acef7c8afad027
 -R f6628307ca7dcc5e74da260d3c3d6ac5
 -U dan
 -Z 7972d84e46f7d6d6e270e54f6c76821e
++P f040a5bb62f3473fba6450c97c68f538d1df21ef a049fbbde5da2e43d41aa8c2b41f9eb21507ac76
++R 622532d44eb7d789368cb4bcd5c9c290
 +U drh
- Z de0bc42fb2718aff4f759eb51f24bd2c
++Z 7f2e42b2e725136d738cebdbb2b0b796

diff --cc manifest.uuid
index a352e381f754ea7e84d7b5c6e9ab6e1d0dc8415d,10c0eea158f857448012a32ec3fe6a83850e933b..1b543c3534380809570b067576edf14302dc74f7
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f040a5bb62f3473fba6450c97c68f538d1df21ef
 -a049fbbde5da2e43d41aa8c2b41f9eb21507ac76
++4d7a802e73ef0352f840bc8d74c560afb7666ff7

diff --cc src/insert.c
Simple merge

diff --cc src/shell.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/update.c
Simple merge