From: drh <drh@noemail.net>
Date: Sat, 27 Aug 2016 14:13:58 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.15.0~110^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=888e1faf953904ee91b044267ba4b54ed0c90557;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: 082fd5f8ac227dbb983da0a772485268af40a484
---

888e1faf953904ee91b044267ba4b54ed0c90557
diff --cc manifest
index ec178d85bc,d84e65cf09..f903178467
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sthe\s"Synopsis"\son\sthe\sOP_Lt,\sOP_Le,\sOP_Gt,\sand\sOP_Ge\sopcodes,\swhich\nhas\sbeen\sbackwards\sfor\stime\sout\sof\smind.
- D 2016-08-27T01:41:53.133
 -C Fix\sthe\sextra\scomments\s(added\swith\s-DSQLITE_ENABLE_EXPLAIN_COMMENTS)\sso\sthat\nthe\ssense\sof\s&lt;,\s&lt;=,\s&gt;,\sand\s&gt;=\stests\sis\scorrect\sand\sso\sthat\sthe\nSQLITE_STOREP2\sversion\sis\sshown\scorrectly.\s\sThese\schanges\sare\salready\sin\sthe\nrowvalue\sbranch\sbut\sare\sadded\shere\ssince\sthey\sare\stechnically\sunrelated\sto\nrowvalue.
 -D 2016-08-27T14:05:12.248
++C Merge\supdates\sfrom\strunk.
++D 2016-08-27T14:13:58.459
  F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
@@@ -346,8 -346,7 +346,8 @@@ F src/global.c c45ea22aff29334f6a9ec549
  F src/hash.c 55b5fb474100cee0b901edaf203e26c970940f36
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
 +F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c a255eb795cf475e7a0659297144fc80f70eb4e30
+ F src/insert.c 3edb5a1bda44df13531fedfcde5fbcc2fc04c222
  F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
  F src/loadext.c dd7a2b77902cc66c22555aef02e1a682554b7aec
  F src/main.c 0bfcf1a5b612dddb4dd0fd04b53ef08ace0f48ff
@@@ -1521,7 -1511,7 +1521,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 829f802be7d4647dd815b739bbc9e1d1ac6a224d
- R 90bb9a2e80849dad7e38b09045c0c98d
 -P 7090147903337864d54ecfb2cd84a3f823973167
 -R ad53b888d897b0241520026ffdb78d22
++P f51248dcfa22e989dacde41021e96a65f12c5ca8 4d43c4698eef4e3db7556813f0274b4018c7c2b9
++R 00d98e75a44793aa199bbed06e05b243
  U drh
- Z ce5881477602b96772cc87ff99cdf3de
 -Z c3f9980f15e4ee005b5e39955b2d9131
++Z 05fa8b41bb716a6f3fffdda76bb03c28
diff --cc manifest.uuid
index cc0a3022ca,a97e000e26..60b210d6db
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f51248dcfa22e989dacde41021e96a65f12c5ca8
 -4d43c4698eef4e3db7556813f0274b4018c7c2b9
++082fd5f8ac227dbb983da0a772485268af40a484