Merge all changes through the first 3.9.0 beta from trunk.

FossilOrigin-Name: 1ccae39b8a7094c2cee2f3fea57c847d0063fa81

diff --cc Makefile.in
index edd9820dd73d82d4b803ece5e430888fb0508acb,9d1020e070dcbcc36d5b7acb4050327f48bf6795..c1612fa00bbae25c98a235768ca8f0376296d870
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -345,10 -345,11 +345,13 @@@ SRC += 
    $(TOP)/ext/rtree/rtree.h \
    $(TOP)/ext/rtree/rtree.c
  SRC += \
 +  $(TOP)/ext/sqlrr/sqlrr.h \
 +  $(TOP)/ext/sqlrr/sqlrr.c \
    $(TOP)/ext/rbu/sqlite3rbu.h \
    $(TOP)/ext/rbu/sqlite3rbu.c
+ SRC += \
+   $(TOP)/ext/misc/json1.c
+ 
  
  
  # Generated source code files
@@@ -582,12 -571,13 +584,12 @@@ libsqlite3.la:  $(LIBOBJ
  libtclsqlite3.la:     tclsqlite.lo libsqlite3.la
        $(LTLINK) -no-undefined -o $@ tclsqlite.lo \
                libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
 -              -rpath "$(TCLLIBDIR)" \
 -              -version-info "8:6:8" \
 -              -avoid-version
 +                -rpath "$(TCLLIBDIR)/sqlite3" \
 +              -version-info "8:6:8"
  
- sqlite3$(TEXE):       $(TOP)/src/shell.c libsqlite3.la sqlite3.h $(JSON1_DEP)
-       $(LTLINK) $(READLINE_FLAGS) $(JSON1_OPT) -o $@ \
-               $(TOP)/src/shell.c $(JSON1_SRC) libsqlite3.la \
+ sqlite3$(TEXE):       $(TOP)/src/shell.c libsqlite3.la sqlite3.h
+       $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
+               $(TOP)/src/shell.c libsqlite3.la \
                $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
  
  sqldiff$(TEXE):       $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h

diff --cc main.mk
index 9d777b8cae1d8f67a342b0bbbab1440c617b1788,66068f668c7399b45a44906bab99585258397d52..73bc204578dd0265b5f536aabd9a6bebd7ef0091
--- 1/main.mk
--- 2/main.mk
+++ b/main.mk
@@@ -502,10 -518,10 +505,10 @@@ sqlite3.o:      sqlite3.
  # files are automatically generated.  This target takes care of
  # all that automatic generation.
  #
- target_source:        $(SRC) $(EXTHDR) $(TOP)/tool/vdbe-compress.tcl
 -target_source:        $(SRC) $(TOP)/tool/vdbe-compress.tcl fts5.c
++target_source:        $(SRC) $(EXTHDR) $(TOP)/tool/vdbe-compress.tcl fts5.c
        rm -rf tsrc
        mkdir tsrc
 -      cp -f $(SRC) tsrc
 +      cp -f $(SRC) $(EXTHDR) tsrc
        rm tsrc/sqlite.h.in tsrc/parse.y
        tclsh $(TOP)/tool/vdbe-compress.tcl $(OPTS) <tsrc/vdbe.c >vdbe.new
        mv vdbe.new tsrc/vdbe.c

diff --cc manifest
index ed3c18e31b3b3b1702b2ec216deac51883483d87,d0e0f762d0bc6874714df04e5c158c45cc9fff33..0a5b2466d55a16a7eaca3058e2ad6937c2f1cbec
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\srecent\strunk\senhancements\sinto\sthe\sapple-osx\sbranch.
- D 2015-09-24T14:43:42.823
 -C Add\s--enable-fts5\sand\s--enable-json1\soptions\sto\sthe\samalgamation\sautoconf\spackage.
 -D 2015-10-09T14:37:15.899
++C Merge\sall\schanges\sthrough\sthe\sfirst\s3.9.0\sbeta\sfrom\strunk.
++D 2015-10-09T17:28:56.474
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 17b57b12d0128ab89a994674aee4c04265ad3966
 -F Makefile.in f0088ff0d2ac949fce6de7c00f13a99ac5bdb663
++F Makefile.in 0f9801da22670ba81bd7b6a17a0db2ea52650841
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc f090cdf036f3c07fb13aa2f4494e388c0b1ed1e4
+ F Makefile.msc 0ed934b4ae6a5ec0b9d7e770104864f8372414ab
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
+ F VERSION cacf16a72f9a03cd06b939a764e32f6f53254c7f
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -233,9 -236,9 +236,9 @@@ F ext/rbu/sqlite3rbu.c ea47de615e911b3a
  F ext/rbu/sqlite3rbu.h 5357f070cd8c0bcad459b620651ec1656859e4d0
  F ext/rbu/test_rbu.c 2a3652241fa45d5eaa141775e4ae68c1d3582c03
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 -F ext/rtree/rtree.c 0f9b595bd0debcbedf1d7a63d0e0678d619e6c9c
 +F ext/rtree/rtree.c 65a024af764c4ee608f039ee67e5bf009327b7bd
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
- F ext/rtree/rtree1.test 541bbcab74613907fea08b2ecdcdd5b7aa724cc9
+ F ext/rtree/rtree1.test 96a80c08440c932cd72aac50660e7af2612d2cda
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
  F ext/rtree/rtree3.test a494da55c30ee0bc9b01a91c80c81b387b22d2dc
  F ext/rtree/rtree4.test c8fe384f60ebd49540a5fecc990041bf452eb6e0
@@@ -264,7 -264,7 +267,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 1bb261f467edb039f8b33a72490bbff69c5fce51
 -F main.mk 784763e87a5080abc749d6263198bbe5aa93fd20
++F main.mk 724659365348ce91a01eb34a4e76b76616fc7b0e
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -285,30 -285,30 +288,30 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c c3a9c4209439b806c44cf30daf466955727bf46c
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c a6b7433b1429d33b2d160f028fb883444d57c0aa
 -F src/btree.c a5a653087ae98dd743d12ae0920d5b64c5335960
++F src/btree.c 4c60a119d7fc66aaec70260d793e266d610ff6dc
  F src/btree.h 40189aefdc2b830d25c8b58fd7d56538481bfdd7
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
- F src/build.c 8a86f4203ac8a9ac0734f242a96f043edffb6018
+ F src/build.c 0549b56722f15c146ca21f82a33838365c2031f0
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
- F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
+ F src/ctime.c 509ef9c64d1321f42448f111da86400b1799218a
  F src/date.c fb1c99172017dcc8e237339132c91a21a0788584
  F src/dbstat.c e637e7a7ff40ef32132a418c6fdf1cfb63aa27c7
- F src/delete.c 371df4fc86e96efeaed3d37565aef77f956be109
- F src/expr.c 3a76afcdac925294c39903b7002ddb9e5fd29863
+ F src/delete.c 35c939eb8bacc9dd8a6715964e5f69feb8c20e44
+ F src/expr.c 36381822e617cb3586d4be1af2cbc3dd5f2b84eb
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 83e1baba999bed3144ea5a2143fc922edf51135f
+ F src/fkey.c 31900763094a3736a5fc887469202eb579fef2d0
  F src/func.c ecdd69ec6a1e406f04cc73324be2ebbf6354197f
  F src/global.c 508e4087f7b41d688e4762dcf4d4fe28cfbc87f9
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 9748a37e058256eb2ead69f028ab85ebf203ad15
+ F src/insert.c a9b7f200081fa1b482a4ccac05165e10371ae9e0
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
  F src/lempar.c d344a95d60c24e2f490ee59db9784b1b17439012
  F src/loadext.c f0b66d28e377fd6c6d36cc9d92df1ff251ebee44
- F src/main.c d3fd6de724a28d6f3256a675c1234a685f5e4355
 -F src/main.c fec97668771438033a7559883401067b139729e1
++F src/main.c 60b45cb19dd4e3f276d70a76a7326606e234e74d
  F src/malloc.c 3a37ce6979a40f499d8cea9e9ab4e8517854d35d
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -320,10 -320,10 +323,10 @@@ F src/msvc.h d9ba56c6851227ab44b3f228a3
  F src/mutex.c 8e45800ee78e0cd1f1f3fe8e398853307f4a085c
  F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
  F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4
- F src/mutex_unix.c 8cfa6e83c618d2fcae0fe63f4d2b5bb16b11a97a
- F src/mutex_w32.c 2e025e6642eaf27597403690980f560d1a91f62c
+ F src/mutex_unix.c a94b46f3f7beba307dde1b298b0f99f9c3677a93
+ F src/mutex_w32.c 5e6fe1c298fb5a8a15aaed4161d5759311431c17
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
 -F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
 +F src/os.c 5822c2b843a77219bba1e28887cdc816b27ca29d
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
@@@ -336,25 -336,24 +339,25 @@@ F src/parse.y f599aa5e871a493330d567ced
  F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef
  F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
  F src/pcache1.c e822007159d53a7ea7aa040d6e28964ddb6de083
- F src/pragma.c a6b01c318f5cc9723ee4df1b212bffbfc4697d3a
 -F src/pragma.c dcfe3a35d2de935feeaba1455528b4a5c4f1208c
++F src/pragma.c f66e2d2d2132373af398c452aac012347fb2adfb
  F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a
 -F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
 +F src/prepare.c 176b060bcf36041193c2807f2b045dce1effa4bb
  F src/printf.c 0c4bcdd1c2e2521024f0a69cb5eb334f86b3652a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 36ee14d729e182cd8b6796f980b7ab3fc9bcee72
- F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
- F src/sqlite.h.in f2a9d6ce5db7c2d5777cebfc96054c8abcb8ddfd
+ F src/select.c 2c4bfdf7c797df9b43121ed7850bf939b6f27405
+ F src/shell.c d25df04168d6ba5a4fa05bdbf859df667f9eb621
 -F src/sqlite.h.in 4b76d74d69af48c534c58fb723137dc6944bdedc
++F src/sqlite.h.in 847154a6981594a0fd372fb08dd13ea620036a2a
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
- F src/sqliteInt.h c53f35e3c4622f5c560f078b0e0330faec2313e9
 -F src/sqliteInt.h e21cc96bc24161df7373f6b24367cf580496889d
++F src/sqliteInt.h 530f13b432ea748dd98a3b9cae2e856918d27128
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
  F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
- F src/test1.c 3c225fcd7e95e81d8733ce9414ca793b8bc4703c
 -F src/test1.c 8fff9c5aa63d6490f516d018b70c12a9cb9a4d8a
++F src/test1.c daa42e4366b022599eae17bf1a0125b355524189
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -368,7 -367,7 +371,7 @@@ F src/test_autoext.c dea8a01a7153b9adc9
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
  F src/test_blob.c e5a7a81d61a780da79101aeb1e60d300af169e07
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c 19a28baf2cfa5adc7c8f77f788f4a1452170a49a
 -F src/test_config.c ada6f38b0acb6722fb7f0ed8c54fd66df41085b9
++F src/test_config.c 099740cd40e978cdc79782b657637fefbb7177a0
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -407,25 -406,25 +410,25 @@@ F src/update.c a134027f59c7eb6e63ed18e2
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c cc4a5aeb2f3037134c70127a019086aa969f7401
 -F src/vdbe.c 1e0bf8d6a2308ce916d444ef399921407fd5d972
++F src/vdbe.c 1f3280cf5b070c0e74a10f8acc4d9f589bead7db
  F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
  F src/vdbeInt.h 8b867eac234e28627ffcace3cd4b4b79bbec664b
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
 +F src/vdbeapi.c b13f483b1375467c367de486edf2be05234e27bb
 +F src/vdbeaux.c f1f5d5acac493d77c8b4240a5bc5c8b6aa7c1227
- F src/vdbeblob.c 1d7b97115e7bbac4c318db416d2ca83fc779544a
+ F src/vdbeblob.c 565fabd302f5fca3bdf3d56cac330483616a39b6
  F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
- F src/vtab.c 2ecfe020c10e0a0c7b078203fdba2fae844744bc
+ F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 -F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 929c1d7e2da94dda41e5c2fa71a919fff91ad04b
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c d5eed2584542e7f3bc78ddef7809a9d76d14d811
+ F src/where.c 4c4646675e794ac71e701289edefd7cd81bac844
  F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
- F src/wherecode.c 7660e1ad16817a921b099af553f3e1349352d16f
- F src/whereexpr.c 2473e4350e30f9b55d1c6a8f66ca23c689f23f1d
+ F src/wherecode.c a32bf1f304f6328e3eefcb82e70bd86836cff343
+ F src/whereexpr.c e63244ca06c503e5f3c5b7f3c9aea0db826089ed
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -622,10 -621,10 +625,10 @@@ F test/exists.test 8f7b27b61c2fbe5822f0
  F test/expr.test 79c3e7502d9e571553b85f0ecc8ff2ac7d0e4931
  F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9
  F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
 -F test/fallocate.test 3e979af17dfa7e5e9dda5eba1a696c04fa9d47f7
 +F test/fallocate.test fe52076a43ff99da8411990dbb4f374e81e88c85
  F test/filectrl.test 7c13f96457435238da99aff7343ad6a3a4885787
  F test/filefmt.test cb34663f126cbc2d358af552dcaf5c72769b0146
- F test/fkey1.test de5b287f6a480b36bd51e8debcf48168e26e4ed2
+ F test/fkey1.test 13e3d48236a2b9f5c5ebd232eef9b3ab682a8a2c
  F test/fkey2.test f3d27ecba480a348c328965d154214719bb158a9
  F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49
  F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d
@@@ -1033,12 -1033,12 +1038,12 @@@ F test/speed4p.explain 6b5f104ebeb34a03
  F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
  F test/speedtest1.c 857439869d1cb4db35e1c720ee9c2756eb9ea2a0
  F test/spellfix.test 0597065ff57042df1f138e6a2611ae19c2698135
- F test/spellfix2.test 1ff48bb65b6198d21674ae24d19bb136e547585a
+ F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
  F test/sqldiff1.test 8f6bc7c6a5b3585d350d779c6078869ba402f8f5
  F test/sqllimits1.test 89b3d5aad05b99f707ee3786bdd4416dccf83304
 -F test/stat.test 8de91498c99f5298b303f70f1d1f3b9557af91bf
 +F test/stat.test d7607786af4054f277f6d48b2465f27b61f380f7
  F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
 -F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
 +F test/stmt.test 78a6764439cfa5abdcbf98d4d084739e81eeec4f
  F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
@@@ -1358,8 -1357,8 +1362,8 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl 84af2b180484323a2ea22a2279e8bd9e3e1e492e
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
- F tool/mksqlite3c.tcl ab34708fd680cca4187710899221a79b6d235d54
- F tool/mksqlite3h.tcl 44730d586c9031638cdd2eb443b801c0d2dbd9f8
 -F tool/mksqlite3c.tcl b66b4170f693602cd6985aed15d9509fe2f18c84
++F tool/mksqlite3c.tcl a4f564e10c919d35dcf0f1b87d16be2cbb082bd7
+ F tool/mksqlite3h.tcl e3ac3f23897d86cb8f5f5df92e91643229fcc8d1
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl bbe57cd9ae11c6cc70319241101ef8d2b8c3765b
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1393,7 -1390,7 +1395,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P f12b8a0f7958260cb8e6b9be1aaa583cf383b39c c6ab807b72ddfc1462f61aa91442b6fac04ace8a
- R 65ab11fbe3da33745104bdda3062f9ad
 -P 92aa4b6b6fbb83f965e4c4be0aa21a8b7e330ed8
 -R 22c99efaaba11dba793d1740711eaae0
 -U dan
 -Z b821d121ea8aa17674df3a472339de94
++P 4dd06d8ba1548552a4fc781207efda810cf34e55 8a4e19888f512c3ee95aa3040924fc932fbdab1a
++R 667c59f235bd76705bff252a3aedd71c
 +U drh
- Z 45e3b9e1f8092f1218dc84c03fca4c89
++Z cdd7a124c72bd1d86b7b29499485a5be

diff --cc manifest.uuid
index c217cc7b12b6460d0b4c1554f27e7e6bdcdcc1c8,d20a675956787787431c4e6b9a4606df71b0b158..9f8b0526105bdf3b94f63fb910c56d1277b088b0
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4dd06d8ba1548552a4fc781207efda810cf34e55
 -8a4e19888f512c3ee95aa3040924fc932fbdab1a
++1ccae39b8a7094c2cee2f3fea57c847d0063fa81

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pragma.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc tool/mksqlite3c.tcl
index bc37c8707519a0e1aeaafd94aab516b16f8b050a,23241e27a6ee4fa79e1c92f31c575f5c7a40b988..7ecac7edcf8ccd9fa23331fe8936842314b2155a
--- 1/tool/mksqlite3c.tcl
--- 2/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@@ -377,9 -377,10 +378,11 @@@ foreach file 
     rtree.c
     icu.c
     fts3_icu.c
 +   sqlrr.c
     sqlite3rbu.c
     dbstat.c
+    json1.c
+    fts5.c
  } {
    copy_file tsrc/$file
  }