From: drh <drh@noemail.net>
Date: Tue, 18 Sep 2018 18:08:01 +0000 (+0000)
Subject: Merge all recent trunk enhancements.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=110e3afd1195eb6871fd4d214a3b9804431d90b5;p=thirdparty%2Fsqlite.git

Merge all recent trunk enhancements.

FossilOrigin-Name: 655f065404e08083ad5eb9b22a036f410b46eb5eb2bcfb0fbc953b4e152c95e7
---

110e3afd1195eb6871fd4d214a3b9804431d90b5
diff --cc manifest
index 1504cd8098,fdd3a7e182..97749237ef
--- a/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Add\sassert()\sstatements\sto\ssqlite3ExprDelete()\sthat\sprove\svarious\ssymmetry\nproperties\sof\sthe\sExpr\sobject\sthat\smight\sbe\sexploited\sto\smake\sthe\sExpr\sobject\nsmaller\sand\sfaster.
- D 2018-07-28T01:30:43.176
 -C Avoid\sincrementing\sthe\sSQLITE_LOOKASIDE_MISS_SIZE\sstat\sbefore\ssqlite3_open()\nreturns.\sFix\stest\sscript\sproblem\sin\slookaside.test.
 -D 2018-09-18T17:50:34.415
++C Merge\sall\srecent\strunk\senhancements.
++D 2018-09-18T18:08:01.839
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
+ F Makefile.in 01e95208a78b57d056131382c493c963518f36da4c42b12a97eb324401b3a334
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 91d78669ce4a4267d6988d16b0bde831ea207e3a2e488efcba558a70dfa45a72
- F README.md 7764d56778d567913ef11c82da9ab94aefa0826f7c243351e4e2d7adaef6f373
- F VERSION d3e3afdec1165a5e593dcdfffd8e0f33a2b0186067eb51a073ef6c4aec34923d
+ F Makefile.msc b946f8806a5d401a299453f61de80dfd1a9df14fa4902b299e6465e3c3134872
+ F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
+ F VERSION 654da1d4053fb09ffc33a3910e6d427182a7dcdc67e934fa83de2849ac83fccb
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -449,8 -453,8 +453,8 @@@ F src/ctime.c b157b01081f92442f8b0218dd
  F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
  F src/dbpage.c 4aa7f26198934dbd002e69418220eae3dbc71b010bbac32bd78faf86b52ce6c3
  F src/dbstat.c edabb82611143727511a45ca0859b8cd037851ebe756ae3db289859dd18b6f91
- F src/delete.c 4c8c7604277a2041647f96b78f4b9a47858e9217e4fb333d35e7b5ab32c5b57f
- F src/expr.c eeb14df211a01166a107dee3af221bff2145391cead4189bfed7e21839decbfa
+ F src/delete.c 107e28d3ef8bd72fd11953374ca9107cd74e8b09c3ded076a6048742d26ce7d2
 -F src/expr.c 92dc4e104b06d06ffeacbd1a4dc0a520daf37f6156278fb6ece5e90e2ca6b610
++F src/expr.c 83c279eda8f3a888141e2432633051f644db68fdb7882c12e0ef00894d7f8ade
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c f59253c0be4b1e9dfcb073b6d6d6ab83090ae50c08b5c113b76013c4b157cd6a
  F src/func.c 7c288b4ce309b5a8b8473514b88e1f8e69a80134509a8c0db8e39c858e367e7f
@@@ -1753,10 -1767,7 +1767,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 02204f8b246c868846f39bd44f2e3bc0fab0275aa09ef3a0e5a8e3d58f484ca8
- R 310262b835cd592d636879692e903d61
- T *branch * expr-simplify
- T *sym-expr-simplify *
- T -sym-trunk *
 -P de2e3cbd08c00d235106c040fa472ec267ef8f1ec13c34ed7d16deac8d50b6cc
 -R 87b8b2ee28b1a1a8366c364e4fdd6314
 -U dan
 -Z 971302d914167dfdeae1d53b5caa351e
++P 81f25d5c84e4d2d0cd3c6a7c105c7c93d310218feeea4e023dbc32e7e96b2a52 e461cb281959d8517296e3e4e934eba8206770b1a592cd7655b6567268da1634
++R da6eee78fa2fbbeca2d219d82da2f3c5
 +U drh
- Z 2ccd694ba875056547f326b1b678ff15
++Z d193f19d8649854bc581fb0b4773613d
diff --cc manifest.uuid
index 6a15e4ee8e,54560e2976..8575e39ee7
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 81f25d5c84e4d2d0cd3c6a7c105c7c93d310218feeea4e023dbc32e7e96b2a52
 -e461cb281959d8517296e3e4e934eba8206770b1a592cd7655b6567268da1634
++655f065404e08083ad5eb9b22a036f410b46eb5eb2bcfb0fbc953b4e152c95e7