From: dan <dan@noemail.net>
Date: Fri, 10 Aug 2018 15:27:55 +0000 (+0000)
Subject: Merge latest trunk changes with this branch.
X-Git-Tag: version-3.25.0~39^2~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7364fb1d040f8282c2089ad08a5887d2eafc7e16;p=thirdparty%2Fsqlite.git

Merge latest trunk changes with this branch.

FossilOrigin-Name: c355a8370782aa70f155ee956fa0faec7f45d7c483c442b169b63c5f0a988fd3
---

7364fb1d040f8282c2089ad08a5887d2eafc7e16
diff --cc manifest
index 53543c23ea,778efc0056..c272a2160d
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sproblem\swith\srenaming\scolumns\son\stables\swith\sREFERENCES\sclauses\sthat\nspecify\sa\slarge\snumber\sof\scolumns.
- D 2018-08-10T14:23:41.928
 -C Fix\sthe\sisLikeOrGlob()\sroutine\sin\sthe\sWHERE\sclause\sprocessing\slogic\sso\sthat\nit\savoids\ssigned/unsigned\scharacter\scomparisons,\sas\sthat\scan\slead\sto\san\nincorrect\sanswer\sif\sthe\sESCAPE\sclause\sis\san\sinvalid\sUTF8\sstring.\s\sProblem\nfound\sby\sOSSFuzz.
 -D 2018-08-09T21:45:45.368
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2018-08-10T15:27:55.230
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@@ -1755,7 -1754,7 +1755,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 fa0fc01eb48a864f0a3d43f9b805d5ed2e530846ee0c34fcbc2eabd9e5696277
- R 9b3e771ebd097f789a9ac4f7b1f4f681
 -P 7404ea83168e6c739ebe8fc5d65bbf0265432ccb35b3418bb0381d74362f7527
 -R ead5801a282cafcaccf5c2894c10f6f8
 -U drh
 -Z 01aec118d9103a512fac51295e82f6a7
++P d48f7bbdf4a1686c25e634a8dec6ead88bf2866fee94ed8e5058f830363424a8 4195a3f8b5d2c2ec63771890c5aa7b5e2de60b9fa2273652730239b8577ae418
++R b24a2e05d71f86ed70ef242ae03982aa
 +U dan
- Z 3a95af73177e80e0d2efb56f6f39b26f
++Z 031a736f5c3b4bef78d9b69d733a942c
diff --cc manifest.uuid
index 1b40428e14,90e55c90a4..533a3fb5f2
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d48f7bbdf4a1686c25e634a8dec6ead88bf2866fee94ed8e5058f830363424a8
 -4195a3f8b5d2c2ec63771890c5aa7b5e2de60b9fa2273652730239b8577ae418
++c355a8370782aa70f155ee956fa0faec7f45d7c483c442b169b63c5f0a988fd3