From: drh <drh@noemail.net>
Date: Mon, 8 Aug 2016 14:21:10 +0000 (+0000)
Subject: Merge all changes from the 3.14 release.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43bbfc5d822ef9fc3825983c2392cd8520964f46;p=thirdparty%2Fsqlite.git

Merge all changes from the 3.14 release.

FossilOrigin-Name: c3cd543f3380475509d7bab9bb6c7858a8402457
---

43bbfc5d822ef9fc3825983c2392cd8520964f46
diff --cc manifest
index 7ea0260f60,9d5c14e49e..dc84c770d8
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sall\srecent\senhancements\sfrom\strunk.
- D 2016-08-04T13:39:44.698
 -C Version\s3.14
 -D 2016-08-08T13:40:27.974
 -F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
++C Merge\sall\schanges\sfrom\sthe\s3.14\srelease.
++D 2016-08-08T14:21:10.199
 +F Makefile.in b0c3cd9e30ffb18d6952dbf3c2ee5ae07c6216d4
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
 +F Makefile.msc c5b2eca5bdf5f73fe9eebf78f07755e2509fd629
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION cb29eb11e493dd85b3eeec4053c03949bf98478e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -327,13 -324,13 +327,13 @@@ F src/alter.c cc28ab933ae615b22add0d609
  F src/analyze.c 37fedc80ac966ce1745811746e68e4d8fa64c7fe
  F src/attach.c 771153bd1f4ab0b97a44a13dde2c7e5e1efeba22
  F src/auth.c 5c8e0f37f785f935f589496801edd19840485853
- F src/backup.c 6df65fdd569c901a418887a1a76f82ec35044556
+ F src/backup.c 17cd25a36d49330df2bacd2cadf2a61f3b525976
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
 -F src/btree.c 2551bd3ecb8b8988fb8b23aabadfb214dbc38e46
 +F src/btree.c 0a3308f223e400a4865ba611073888683fce4af6
  F src/btree.h 075c45707c0f8f8af118f739f36df8098a08b7da
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c d1fdfd7ab8f5447e494ef15825973bf0719527c6
+ F src/build.c 7c3c780b703c09314032c8f6e4e7c1d80241a818
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
@@@ -370,11 -367,11 +370,11 @@@ F src/os.c c03b50496df5815e8f6d45bae440
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 -F src/os_unix.c a9443cdab41d7f3cdf0df3a5aab62fd6e1c9b234
 -F src/os_win.c 520f23475f1de530c435d30b67b7b15fe90874b0
 +F src/os_unix.c defa2c6c6e01219459fa783d2f55841271c4eebc
 +F src/os_win.c 8ba3403e276b0b01fd822bfcc162b83cacc80a1a
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c db9dccd139b20213507392831341ad64505c4106
- F src/pager.h 0bd89bacf4b410ef36d928f6f1f7ec0913f74702
 -F src/pager.c 40928c450320da78bb4bd3ae82818f4239e19b7e
 -F src/pager.h 966d2769e76ae347c8a32c4165faf6e6cb64546d
++F src/pager.c 5111055cd7c85e3b6f8de02fc1ae382397f89a62
++F src/pager.h 16644d79a66502f77389648ad5f2dca0ce0095de
  F src/parse.y 99b676e6fc2f4e331ab93e76b3987cffdbd28efa
  F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
@@@ -388,11 -385,10 +388,11 @@@ F src/resolve.c 0392c6686586b1d4dac9a41
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
  F src/shell.c 79dda477be6c96eba6e952a934957ad36f87acc7
- F src/sqlite.h.in 21a208cd353619cf1f3d6ec486d1476abd047ee3
 -F src/sqlite.h.in 0f7580280d1b009b507d8beec1ff0f197ba0cc99
++F src/sqlite.h.in 5894333db09c72e6a0c8b75d1e61f1a5b269ba35
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
 -F src/sqliteInt.h d6f221a5bd572df935140beda82f357c2185a77c
 +F src/sqliteInt.h 843e15ad1367967c74de7eeef088a6659613d395
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -462,10 -458,10 +462,10 @@@ F src/vdbeblob.c 83d2d266383157b02e2b80
  F src/vdbemem.c 1ecaa5ee0caff07255f25d04e8dc88befb6f88d1
  F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
- F src/vtab.c 6fece06fdd50eb2b0673e37e627ce6710e4af5be
+ F src/vtab.c 6b3cfaff7e4397739d6b48511e777ca58c6d06d4
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
 -F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
 +F src/wal.c 25bc1cea2ab18a917548dd0a30c299c538878ef9
 +F src/wal.h f38853cd771ff42f448de4f908238f2e2966ac8f
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
  F src/where.c 5c9df42d50888be8274a5a0eb062eb0629869bd3
  F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
@@@ -1109,9 -1104,9 +1109,9 @@@ F test/spellfix3.test 0f9efaaa502a0e0a0
  F test/sqldiff1.test 28cd737cf1b0078b1ec1bbf425e674c47785835e
  F test/sqllimits1.test a74ee2a3740b9f9c2437c246d8fb77354862a142
  F test/sqllog.test 6af6cb0b09f4e44e1917e06ce85be7670302517a
- F test/stat.test ab95d28503d0f6d98ffd8ce204643c9da090ebf1
+ F test/stat.test f8f1279ffffabe6df825723af18cc6e0ae70a893
  F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
 -F test/stmt.test 64844332db69cf1a735fcb3e11548557fc95392f
 +F test/stmt.test fc832e52bd1273144abbb27c07fc01d1acdd9939
  F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
@@@ -1514,7 -1509,10 +1514,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P e22ca3cdd02483b68595a59ccb7a1fcb3580ab04 9adda385267d1a0ecff259b42a284913668441a2
- R 6bd714ecd3e4d00065ff30edf27ebb48
 -P ebc396a19fa79bea208ecda277ffff5d02166d0b
 -R e7962d3372d6a1e29e3980753a6f0162
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.14.0 *
++P dacfff514034602361cd5325deba8d9b9691f865 d5e98057028abcf7217d0d2b2e29bbbcdf09d6de
++R 1eb04bd85f02d76bdade72e725fe4877
  U drh
- Z c0ee788ceb69ebaffc2368f7cc8614b3
 -Z ecb9b7072c2b71d36f58909f83563ec2
++Z ceecc15bd203b97fbd4e9a7a7f4acafe
diff --cc manifest.uuid
index 54d2f123df,732a4af61b..5ad31eab9d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- dacfff514034602361cd5325deba8d9b9691f865
 -d5e98057028abcf7217d0d2b2e29bbbcdf09d6de
++c3cd543f3380475509d7bab9bb6c7858a8402457