Merge the version 3.9.0 changes and the incorporation of JSON1 and FTS5

into the amalgamation from trunk.

FossilOrigin-Name: c1d96fb654b2c0f66d586aa39d80ea0468186690

diff --cc Makefile.in
index d34ee84fb2c28514013fa8c52a6f716e8a968853,9d1020e070dcbcc36d5b7acb4050327f48bf6795..d8b087c2e6234a849506de187671a027288b69c6
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -353,7 -347,11 +353,9 @@@ SRC += 
  SRC += \
    $(TOP)/ext/rbu/sqlite3rbu.h \
    $(TOP)/ext/rbu/sqlite3rbu.c
+ SRC += \
+   $(TOP)/ext/misc/json1.c
  
 -
 -
  # Generated source code files
  #
  SRC += \
@@@ -998,9 -993,9 +1000,12 @@@ fts3_write.lo:   $(TOP)/ext/fts3/fts3_wri
  rtree.lo:     $(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/rtree/rtree.c
  
 +sqlite3session.lo:    $(TOP)/ext/session/sqlite3session.c $(HDR) $(EXTHDR)
 +      $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/session/sqlite3session.c
 +
+ json1.lo:     $(TOP)/ext/misc/json1.c
+       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/misc/json1.c
+ 
  # FTS5 things
  #
  FTS5_SRC = \

diff --cc Makefile.msc
index b818ff160653f8641d933f75013129a65551f451,b486c8b8d1b842ad8be91476ce1f961e50976e96..883fb967f0c2230915d35203e071109025dcda57
--- 1/Makefile.msc
--- 2/Makefile.msc
+++ b/Makefile.msc
@@@ -1018,10 -1007,9 +1018,11 @@@ SRC4 = 
    $(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\rbu\sqlite3rbu.c \
+   $(TOP)\ext\misc\json1.c
  
  
  # Generated source code files

diff --cc main.mk
index 401906d9816e8841059c05f71abbd7c80066471b,66068f668c7399b45a44906bab99585258397d52..38cca84374bd77415a7536d0f5af7856b46d6615
--- 1/main.mk
--- 2/main.mk
+++ b/main.mk
@@@ -47,8 -49,8 +49,9 @@@
  TCCX =  $(TCC) $(OPTS) -I. -I$(TOP)/src -I$(TOP) 
  TCCX += -I$(TOP)/ext/rtree -I$(TOP)/ext/icu -I$(TOP)/ext/fts3
  TCCX += -I$(TOP)/ext/async -I$(TOP)/ext/userauth
 +TCCX += -I$(TOP)/ext/session
  TCCX += -I$(TOP)/ext/fts5
+ THREADLIB += $(LIBS)
  
  # Object files for the SQLite library.
  #
@@@ -385,8 -383,7 +388,9 @@@ TESTSRC2 = 
    $(TOP)/ext/fts3/fts3_tokenizer.c \
    $(TOP)/ext/fts3/fts3_write.c \
    $(TOP)/ext/async/sqlite3async.c \
-   $(TOP)/ext/session/test_session.c
 +  $(TOP)/ext/session/sqlite3session.c \
++  $(TOP)/ext/session/test_session.c \
+   $(FTS5_SRC)
  
  # Header files used by all library source files.
  #
@@@ -727,11 -729,9 +739,11 @@@ testfixture$(EXE): $(TESTSRC2) libsqlit
                $(TESTSRC) $(TESTSRC2) $(TOP)/src/tclsqlite.c                \
                -o testfixture$(EXE) $(LIBTCL) libsqlite3.a $(THREADLIB)
  
- amalgamation-testfixture$(EXE): sqlite3.c fts5.c $(TESTSRC) $(TOP)/src/tclsqlite.c  \
 -amalgamation-testfixture$(EXE): sqlite3.c $(TESTSRC) $(TOP)/src/tclsqlite.c
++amalgamation-testfixture$(EXE): sqlite3.c $(TESTSRC) $(TOP)/src/tclsqlite.c  \
 +                              $(TOP)/ext/session/test_session.c
        $(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
-               $(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c fts5.c           \
+               $(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c                  \
 +              $(TOP)/ext/session/test_session.c                            \
                -o testfixture$(EXE) $(LIBTCL) $(THREADLIB)
  
  fts3-testfixture$(EXE): sqlite3.c fts3amal.c $(TESTSRC) $(TOP)/src/tclsqlite.c

diff --cc manifest
index de9d87e9cfb179f3237f7e3ba1affcec93169df6,d0e0f762d0bc6874714df04e5c158c45cc9fff33..3a14d6a1976e046d284bbd9e00d4ed734cbc6cff
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sthe\s3.8.12\sbeta\schanges\sfrom\strunk.
- D 2015-10-08T14:55:30.090
 -C Add\s--enable-fts5\sand\s--enable-json1\soptions\sto\sthe\samalgamation\sautoconf\spackage.
 -D 2015-10-09T14:37:15.899
++C Merge\sthe\sversion\s3.9.0\schanges\sand\sthe\sincorporation\sof\sJSON1\sand\sFTS5\ninto\sthe\samalgamation\sfrom\strunk.
++D 2015-10-09T15:29:24.465
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in fdcfdc361f0a3723da9b48b967f259f7aaff3ad5
 -F Makefile.in f0088ff0d2ac949fce6de7c00f13a99ac5bdb663
++F Makefile.in de2700ab4ca481c15970405274ccf3c872026e3c
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 2f913bc2229596a31ec1025ce34aef9634164a6a
 -F Makefile.msc 0ed934b4ae6a5ec0b9d7e770104864f8372414ab
++F Makefile.msc 9025b539b5dc491ea9c6c9c04109d2ff617bc990
  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
@@@ -284,7 -264,7 +284,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk f0a074da8e55de2646bc3aca50f13989d4558c1e
 -F main.mk 784763e87a5080abc749d6263198bbe5aa93fd20
++F main.mk a43e99059b03953281f629ac8b27ba600cdd4429
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -311,10 -291,10 +311,10 @@@ F src/btreeInt.h 8177c9ab90d772d6d2c6c5
  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 35c939eb8bacc9dd8a6715964e5f69feb8c20e44
 +F src/delete.c 4545c9f793f27d14a32195f6a0b121913a80f692
  F src/expr.c 36381822e617cb3586d4be1af2cbc3dd5f2b84eb
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 31900763094a3736a5fc887469202eb579fef2d0
@@@ -328,7 -308,7 +328,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c d344a95d60c24e2f490ee59db9784b1b17439012
  F src/loadext.c f0b66d28e377fd6c6d36cc9d92df1ff251ebee44
- F src/main.c 34206b735954c44defba8f324b613e5d5de89ce3
 -F src/main.c fec97668771438033a7559883401067b139729e1
++F src/main.c 3679a4f40434358fdfdfc86bf9576604b8d6fc9b
  F src/malloc.c 3a37ce6979a40f499d8cea9e9ab4e8517854d35d
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -364,16 -344,16 +364,16 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c 2c4bfdf7c797df9b43121ed7850bf939b6f27405
- F src/shell.c f38cfe6a0b971d50158e71880852119bdca89ce9
 -F src/shell.c d25df04168d6ba5a4fa05bdbf859df667f9eb621
 -F src/sqlite.h.in 4b76d74d69af48c534c58fb723137dc6944bdedc
++F src/shell.c 993863f82d764be0c00803056e56b9b744f86f02
 +F src/sqlite.h.in 8f4deb5874227c7635300fb75105ff6e92131fb5
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
 -F src/sqliteInt.h e21cc96bc24161df7373f6b24367cf580496889d
 +F src/sqliteInt.h 4150e72a668204fbcbdfbcc5f44c9aa5151663f8
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
 -F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
 +F src/tclsqlite.c e2344bee0d192397f555a24ef3fab26f2ed93bcc
- F src/test1.c c96508c835979bf15dc0e3146e2c7a51a2333d3c
+ F src/test1.c 8fff9c5aa63d6490f516d018b70c12a9cb9a4d8a
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -387,7 -367,7 +387,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 548c99a1a91fd89fe2c94ee08017884091e3d6f0
 -F src/test_config.c ada6f38b0acb6722fb7f0ed8c54fd66df41085b9
++F src/test_config.c 6d95fdff9fa8668db56a8b8ac78c7fa1d1ffd483
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -1378,8 -1357,8 +1378,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 038ed0aee939e6207c462727088a08d0bdf49a8c
- F tool/mksqlite3h.tcl 96d92fcac21c6037d9db20c7cb2e06b534b550ac
 -F tool/mksqlite3c.tcl b66b4170f693602cd6985aed15d9509fe2f18c84
 -F tool/mksqlite3h.tcl e3ac3f23897d86cb8f5f5df92e91643229fcc8d1
++F tool/mksqlite3c.tcl a52d7e8c0888f9384fbfa2c6ddd5f357409758b9
++F tool/mksqlite3h.tcl 39ed050ffc5ec8951bd5118c06a132ef41b859c7
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl bbe57cd9ae11c6cc70319241101ef8d2b8c3765b
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1411,7 -1390,7 +1411,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 7695890230dc1e0c6db9b7aa509db2039c7f7239 77b707b77496a08703fe9405e8e4521a4e5b419e
- R 484e6e15f7bc3708de45fd25742a1667
 -P 92aa4b6b6fbb83f965e4c4be0aa21a8b7e330ed8
 -R 22c99efaaba11dba793d1740711eaae0
 -U dan
 -Z b821d121ea8aa17674df3a472339de94
++P 35b1b8d4b97715030700e37b292bb4f1bb3f44d6 8a4e19888f512c3ee95aa3040924fc932fbdab1a
++R f005c1911f49ea59f115ca01df4b8659
 +U drh
- Z 02c522f97e4db3ce71ca22576dc5b408
++Z fe8223e98215302615def90ec799c3a5

diff --cc manifest.uuid
index 03f88e0e6a2784fe10f77c5b0ee3666713061dce,d20a675956787787431c4e6b9a4606df71b0b158..94a03e8a6420f29c3f0267ed6e4db14a6154e198
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 35b1b8d4b97715030700e37b292bb4f1bb3f44d6
 -8a4e19888f512c3ee95aa3040924fc932fbdab1a
++c1d96fb654b2c0f66d586aa39d80ea0468186690

diff --cc src/main.c
Simple merge

diff --cc src/shell.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc tool/mksqlite3c.tcl
index f2f949e405bd59bff1e81c56c4236f836c6bd22b,23241e27a6ee4fa79e1c92f31c575f5c7a40b988..97b42a475d5d97f6699027d29b82587ea9495511
--- 1/tool/mksqlite3c.tcl
--- 2/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@@ -381,7 -379,8 +382,9 @@@ foreach file 
     fts3_icu.c
     sqlite3rbu.c
     dbstat.c
 +   sqlite3session.c
+    json1.c
+    fts5.c
  } {
    copy_file tsrc/$file
  }

diff --cc tool/mksqlite3h.tcl
index 07d3e8be36c6d154b45ea73d3ab896c05cecd744,2fe2157387331ce304330aa2ec1a4aac4e1d53bf..4cf8595fa5a488d2c56dc1ebada41505b87e5c1f
--- 1/tool/mksqlite3h.tcl
--- 2/tool/mksqlite3h.tcl
+++ b/tool/mksqlite3h.tcl
@@@ -71,7 -71,7 +71,8 @@@ fconfigure stdout -translation l
  set filelist [subst {
    $TOP/src/sqlite.h.in
    $TOP/ext/rtree/sqlite3rtree.h
 +  $TOP/ext/session/sqlite3session.h
+   $TOP/ext/fts5/fts5.h
  }]
  
  # These are the functions that accept a variable number of arguments.  They