From: drh <drh@noemail.net>
Date: Fri, 11 Nov 2016 17:52:57 +0000 (+0000)
Subject: Merge enhancements and bug-fixes from trunk.
X-Git-Tag: version-3.16.0~126^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79297d1d5979a82655590db1c53f76942ebc4b40;p=thirdparty%2Fsqlite.git

Merge enhancements and bug-fixes from trunk.

FossilOrigin-Name: 5515b827dc1805a3010018cd6abf222b03525d24
---

79297d1d5979a82655590db1c53f76942ebc4b40
diff --cc manifest
index 815694d6be,fb719999e7..fc888c5656
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Avoid\sa\sfew\sunnecessary\scalls\sto\ssqlite3BtreeMovetoUnpacked().
- D 2016-11-10T20:42:08.396
 -C Fix\sa\sproblem\swith\sswitching\sfrom\swal\sto\srollback\smode\swhen\nSQLITE_DBCONFIG_NO_CKPT_ON_CLOSE\sis\sconfigured.
 -D 2016-11-11T17:08:51.459
++C Merge\senhancements\sand\sbug-fixes\sfrom\strunk.
++D 2016-11-11T17:52:57.982
  F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc e0217f2d35a0448abbe4b066132ae20136e8b408
@@@ -385,11 -385,11 +385,11 @@@ F src/pragma.h 64c78a648751b9f4f297276c
  F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
  F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 3fac1b2737ea5a724f20b921ac7e259c9be2100b
+ F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 -F src/select.c ea3af83e2d0f245fef81ea4cf04cb730ce67f722
 +F src/select.c 0a7c523d755bcd39ae54f6a44bb66a7f0e1d89b3
- F src/shell.c 63e54cfa1c7ec5b70a4c9a86502bc10280c3d5a3
- F src/sqlite.h.in 97e9b0f952306677db82b055147ed1d99cb7ba66
+ F src/shell.c f04e4af75c5517735397d060ed0b4a874104bb41
+ F src/sqlite.h.in 803f7050f69b2eea573fac219f3c92582c096027
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
  F src/sqliteInt.h 37628fe30c464dc790bcee3bfd3d0caa8f222ed1
@@@ -1530,7 -1532,7 +1532,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 f7041cbb63b912f9ecad538804b6f2383efbec4e
- R d3d5f8b510b4445e2e54b3c5a8a5e3a5
 -P 119d6ef8478ea6ab07dfd0e974d2f5a8dcfce87e
 -R 713cac12bbad56d229ae83741d89e9ae
 -U dan
 -Z eb4e3f5ce4749269e2c70de28f3602c7
++P eac0e827a61cfec4dd9b6d407ff398e9fda3510b 46e0016207b8e7df2ae6c7491fd0f3c2926eed21
++R 702d892ba95768248d8c7e81d0fa0aa8
 +U drh
- Z 4683912e0f389e0006dbaa0668a519e9
++Z 50432314c566096bfb1a843cbbc042aa
diff --cc manifest.uuid
index 49b87ea866,cdd0440791..94b93d5a27
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- eac0e827a61cfec4dd9b6d407ff398e9fda3510b
 -46e0016207b8e7df2ae6c7491fd0f3c2926eed21
++5515b827dc1805a3010018cd6abf222b03525d24