From: drh <drh@noemail.net>
Date: Tue, 14 Jul 2015 15:39:22 +0000 (+0000)
Subject: Merge trunk changes, including the addition of FTS5 and pcache1 performance
X-Git-Tag: version-3.13.0~148^2~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38151adfe2f51c07ca50e9cbc6f44a9811097eb1;p=thirdparty%2Fsqlite.git

Merge trunk changes, including the addition of FTS5 and pcache1 performance
enhancements.

FossilOrigin-Name: db4cbefb8674c6cfff27c1e918741de1885c845c
---

38151adfe2f51c07ca50e9cbc6f44a9811097eb1
diff --cc main.mk
index 34937bf94d,4b84873316..0cf9a050af
--- a/main.mk
+++ b/main.mk
@@@ -73,12 -72,7 +73,10 @@@ LIBOBJ+= vdbe.o parse.o 
  	 vdbetrace.o wal.o walker.o where.o wherecode.o whereexpr.o \
           utf.o vtab.o
  
 +LIBOBJ += sqlite3session.o
 +
 +LIBOBJ += fts5.o
  
- 
- 
  # All of the source code files.
  #
  SRC = \
diff --cc manifest
index 1ce4000b84,a07ab9a0dd..b075097222
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sin\sthe\slatest\senhancements\sfrom\strunks,\sespecially\sthe\suse\sof\n_byteswap_ulong()\sand\ssimilar\sintrinsics\son\sMSVC.
- D 2015-07-02T18:47:12.801
 -C Always\sinvoke\sthe\sprofile\scallback\seven\sif\sthe\sstatement\sdoes\snot\srun\sto\ncompletion.
 -D 2015-07-14T14:48:50.217
++C Merge\strunk\schanges,\sincluding\sthe\saddition\sof\sFTS5\sand\spcache1\sperformance\nenhancements.
++D 2015-07-14T15:39:22.594
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 5f96aa7b5ea06cbc72500e85d64f75f4ecd5ed52
 -F Makefile.in 2a4a94d9c6ad8cde388b672d89d1463e6f38a6da
++F Makefile.in 82cd7996d31d7b0a9a80a6c247ad9fd9b41223af
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 0600e09c21aeb7bff79e6badff56a406f68ced22
 -F Makefile.msc 86926e2330ad4b7ae6d4674762b53b293873b3fb
++F Makefile.msc 69a5df1f8764b991cb1a269825538258f9097c4c
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@@@ -267,7 -248,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 574470491635f477235a16df7bd80e1a22a9a282
 -F main.mk 551665e0bf7bd275a3e49dc8569ccb17098f7179
++F main.mk c4250d110d0275a9903f12788346f1dc795275bf
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -311,8 -292,8 +311,8 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 92bafa308607dd985ca389a788cd9e0a2b608712
  F src/loadext.c e722f4b832f923744788365df5fb8515c0bc8a47
 -F src/main.c 92d79bfa1a36c7c554700bb58eb8327abff1ac5c
 +F src/main.c 5e170f7c4872c272d733572a99628e47fe92ab43
- F src/malloc.c 9be4e645f2fb411e5a04cf97e91f68b4faa6dc81
+ F src/malloc.c 19461e159bccf0e2cf06a50e867963d0a7b124a8
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -346,12 -327,12 +346,12 @@@ F src/printf.c db11b5960105ee661dcac690
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 2d47554370de8de6dd5be060cef9559eec315005
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 7003fe663bc0636b656874440845a85dcbad4ba7
+ F src/select.c d3c04f01549317afbe02455c4ca9465100e9c5fe
 -F src/shell.c 8af3cced094aebb5f57a8ad739b9dafc7867eed7
 -F src/sqlite.h.in 3d951bf985839de7fcf4d3f69568bb4df2641abe
 +F src/shell.c e4ad9031072a6d679b2c69a780014d30db62dc7f
- F src/sqlite.h.in 876ad21b9a6bb5034db7c44cdebd5df2292a5336
++F src/sqlite.h.in 84aac470adebde08e319c200f892664c6e976692
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h be1a718b7d2ce40ceba725ae92c8eb5f18003066
- F src/sqliteInt.h b408931086cdcebb6d70c3561b7fe18efb2d48c9
 -F src/sqliteInt.h d8d420d66a5c403b119696159b69f71cd53840ce
++F src/sqliteInt.h f5d9aa5d0cb0c89af4030c5b5b0ff93d5ef1e9a3
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -405,17 -386,17 +405,17 @@@ F src/threads.c 6bbcc9fe50c917864d48287
  F src/tokenize.c 57cb3720f53f84d811def2069c2b169b6be539a5
  F src/treeview.c c84b1a8ebc7f1d00cd76ce4958eeb3ae1021beed
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
 -F src/update.c 487747b328b7216bb7f6af0695d6937d5c9e605f
 +F src/update.c 24dd6a45b8b3470e62702128ebf11be1f2693145
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
- F src/util.c 075c2878fb698bd387164047ecdf76f6cbacf402
+ F src/util.c 46358a204b35971a839341cf64599d65b151ba88
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 5ee4a2bf871418f61d06dc256b9b3a0084b5ec46
 -F src/vdbe.h 7a75045d879118b9d3af7e8b3c108f2f27c51473
 -F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816
 -F src/vdbeapi.c 2fa7ed7520313d6dd1dc6e6495999201c630adfc
 -F src/vdbeaux.c 787f5f9d58f4c6f39294ed06909ba602d1a402e6
 -F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
 -F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090
 +F src/vdbe.c 195b32310c7062847a45fda214b32ceb8f8f6ab2
 +F src/vdbe.h d0f8ab919146109d080cde4b0840af9b5fafad4b
 +F src/vdbeInt.h 963c87c4bf8040c0a316ca3e58f8a4888e1fa3c4
- F src/vdbeapi.c a5d2e8afd53b4f81934f5ca59c04465cd1a6d50d
- F src/vdbeaux.c d6bfb7b4291bc033283140e21c2da2ce04ef0f78
++F src/vdbeapi.c 86f01f72f8341c0394ff745e68962b17bfb0974e
++F src/vdbeaux.c 2d86fc5411e4e659c9181ef642c63dff602b3684
 +F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846
 +F src/vdbemem.c 6c9e261d135fc175da2f34e46d60243a19fffb9f
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 082b35a25a26e3d36f365ca8cd73c1922532f05e
@@@ -919,9 -901,9 +920,9 @@@ F test/pagerfault3.test 1003fcda009bf48
  F test/pageropt.test 6b8f6a123a5572c195ad4ae40f2987007923bbd6
  F test/pagesize.test 5769fc62d8c890a83a503f67d47508dfdc543305
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
- F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
+ F test/pcache2.test ec3ae192f444ee6a0a80d1fd80d99695d884bfb3
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
 -F test/permutations.test 6a88fd9ca15b804e9c20990773262ca67494058f
 +F test/permutations.test 1a49f543ec7f0e075ca24eae3bda7f75bb00634b
  F test/pragma.test be7195f0aa72bdb8a512133e9640ac40f15b57a2
  F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
@@@ -1384,7 -1365,7 +1385,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 39936b33b0668aad81aa574d4d74c92b0ddd218a bcc8a75509aafda61feb6dcc074668c79611a662
- R e09654bed267c32e59df855cf5a22b97
 -P e548d77b3c91cdf11c78d1a688fd768e209bdbf5
 -R f434f0b9092147e4e9389e2958ccbd33
++P 85ca4409bdca7aee801e9fba1c49a87fabbf2064 202479aa0a62067343e724487960b8a039e2e978
++R 582a57d0946e0ad5287c5fb6b7d3efee
  U drh
- Z 52c48858632936f2e97d9ccb5e52e5d7
 -Z 3bea78814fd8f9c4678ec13302736bdc
++Z a3ed5c85e5c2e63374f7522fd856797b
diff --cc manifest.uuid
index 33db24038d,e4e6a3512a..e44d2c0c24
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 85ca4409bdca7aee801e9fba1c49a87fabbf2064
 -202479aa0a62067343e724487960b8a039e2e978
++db4cbefb8674c6cfff27c1e918741de1885c845c