From: drh <drh@noemail.net>
Date: Fri, 19 Aug 2016 15:41:24 +0000 (+0000)
Subject: Merge recent enhancements from trunk.
X-Git-Tag: version-3.15.0~110^2~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b684fd5c4a5ade7cb6f7de5a13f86654e293ef6d;p=thirdparty%2Fsqlite.git

Merge recent enhancements from trunk.

FossilOrigin-Name: b17872363b60edab05a5d382a44038aad91e4d9f
---

b684fd5c4a5ade7cb6f7de5a13f86654e293ef6d
diff --cc manifest
index edfe85439e,2c686caa9b..23b276d0a0
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sSQL\sNULL\shandling\sbug\sin\sthe\svector\sIN\soperator\scode\sgeneration.
- D 2016-08-18T19:04:57.401
 -C Enhance\sthe\sVACUUM\scommand\sso\sthat\sit\scan\soperate\son\san\sattached\sdatabase.
 -D 2016-08-19T15:15:55.612
++C Merge\srecent\senhancements\sfrom\strunk.
++D 2016-08-19T15:41:24.228
  F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@@ -373,7 -373,7 +373,7 @@@ F src/os_win.c 520f23475f1de530c435d30b
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
  F src/pager.c 40928c450320da78bb4bd3ae82818f4239e19b7e
  F src/pager.h 966d2769e76ae347c8a32c4165faf6e6cb64546d
- F src/parse.y d240b1518fa9c5cb02b222e1fac8e07d950c9ed9
 -F src/parse.y ed6990c2d41eb0302eda90d5009c51fec792c850
++F src/parse.y 3d02d64f333c4371c4f08fbd79a64964fa27b576
  F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
  F src/pcache1.c 4bb7a6a5300c67d0b033d25adb509c120c03e812
@@@ -384,12 -384,12 +384,12 @@@ F src/printf.c a5f0ca08ddede803c241266a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c d67b9a5cc33339256e2088c5a722745fc2ff5219
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c 3a5ddce5d3773c42e4bd96ee93e758c22cbc59ae
 -F src/select.c fda7fd24b4d8e75479ae581329db0a0b0bf76633
++F src/select.c cf90abce32567023c940ecabf5707c4714c61c92
  F src/shell.c 79dda477be6c96eba6e952a934957ad36f87acc7
  F src/sqlite.h.in 0f7580280d1b009b507d8beec1ff0f197ba0cc99
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h f4079dcc83ec216d34531792626206a1a35463bc
 -F src/sqliteInt.h 153099746007418dfa03a99c8355c8d47b0a1cc9
++F src/sqliteInt.h 02b7f4bd9f945fbc46b05f7914b9c43d89517c59
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -449,8 -449,8 +449,8 @@@ F src/trigger.c 11e20b3b12c847b3b905559
  F src/update.c 8179e699dbd45b92934fd02d3d8e3732e8da8802
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
- F src/vacuum.c f6f10c88f8af5feb6b3632e5e4133e4482819c4f
- F src/vdbe.c 9a1c5a2d1980ca6a111ce8649e06ed8c790ee1fc
+ F src/vacuum.c 913970b9d86dd6c2b8063ef1af421880f1464ec3
 -F src/vdbe.c 15376952b0c5dc0afbac6cd8791579dd19ff0a01
++F src/vdbe.c 766d363ef6520c671eef165098a24c0c6ef36d89
  F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
  F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
  F src/vdbeapi.c a32d61b7dd05e6890d8fd44d2805f55e2f5ba9f3
@@@ -1517,7 -1511,8 +1518,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 3b27a5da100037f75a4efc15e0354a6aa94194f8
- R cb7673431cbb14ee2064b1a631b51486
 -P cb9865e14db1c0076618f13400151112f84960cb ad35ef116296e5d6aaeb9ef260bf35bee3bd6d20
 -R abd29f9f3d87c2af53d085425233b2a6
 -T +closed ad35ef116296e5d6aaeb9ef260bf35bee3bd6d20
++P 936146b12e27784f15a68fe65732c6d92c3a12f3 083f9e6270fa4faa402b91231271da4f3915c79f
++R b0cf551e47740f01d348f132bf9f7791
  U drh
- Z e68c3ca3548a25a2524e065bf2465c19
 -Z a6de375e7bb722769082d6e640b9c49b
++Z 4f11e98ced958b5a8510961832e75233
diff --cc manifest.uuid
index 105e0106d8,4e9d48c81e..64c87f47eb
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 936146b12e27784f15a68fe65732c6d92c3a12f3
 -083f9e6270fa4faa402b91231271da4f3915c79f
++b17872363b60edab05a5d382a44038aad91e4d9f