From: dan <dan@noemail.net>
Date: Thu, 25 Apr 2019 20:06:34 +0000 (+0000)
Subject: Merge latest trunk changes into this branch.
X-Git-Tag: version-3.29.0~176^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6aa001527c8e4288c2d55748af659aa03e026df9;p=thirdparty%2Fsqlite.git

Merge latest trunk changes into this branch.

FossilOrigin-Name: 1da302d85d7ad4ba54f877117a45d667439fd2ef31dc70ea1d54dc1fba196e68
---

6aa001527c8e4288c2d55748af659aa03e026df9
diff --cc manifest
index f7a1f6f81c,261ca06463..c6b5a05076
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Unless\sthe\s"--freelist-corrupt"\soption\sis\sspecified,\sdo\snot\shave\sthe\s.recover\scommand\sattempt\sto\srecover\sdata\sfrom\spages\sthat\sare\son\sthe\sdatabase\sfree-list.
- D 2019-04-25T19:23:15.197
 -C New\stest\scases\sin\stest/fuzzdata8.db.
 -D 2019-04-24T17:04:02.548
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2019-04-25T20:06:34.069
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -519,8 -518,8 +519,8 @@@ F src/printf.c 67f79227273a9009d86a0176
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 567888ee3faec14dae06519b4306201771058364a37560186a3e0e755ebc4cb8
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
- F src/select.c 9263f5c30dd44c7ac2eb29f40a7ec64322a96885b71c00de6bc30b756c2e1c49
- F src/shell.c.in a3b1bb23c3c3dde9aab1823dc37cb0f3e81debfd3937e40ee8fa69fe1f0e4c16
+ F src/select.c b7304d2f491c11a03a7fbdf34bc218282ac54052377809d4dc3b4b1e7f4bfc93
 -F src/shell.c.in bcfa17eb257bf8dc2359e99ba7e6bdfab7901705db013bc47a5be6d7fa7a037e
++F src/shell.c.in 78004b100ed486695f4ff8bbc40b99c2e4d7b6d06278ce64b80ac1900bf356a3
  F src/sqlite.h.in 38390767acc1914d58930e03149595ee4710afa4e3c43ab6c3a8aea3f1a6b8cd
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5
@@@ -1821,7 -1818,7 +1821,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 959bbd11e92cc789973daf20dfcb8a6d8dc724dd603b286cbdd59e5d1fdb2909
- R d86f5b916c733bd261b32efe2b58444b
 -P e1724f1d618cfbcfd1e495d8965a395656cfc1114e1bffd4bc3be0bd5cdb6550
 -R 3e1175ca2cd3d699a0989ce182ed2c32
 -U drh
 -Z b7a4bb53a6677ebeb4f1be668326c373
++P 8d2f52bb640d6d0f84b18d746043e56f45a73ace93239be1d036701f7f4018fd 7be6222c9ec44596e4eddd906c831eb1272b90fbdf68641d791f216264feb7cf
++R af342ccd780cc18bf46aaaf7890063fa
 +U dan
- Z 3b2dfcc08d011cfeb383f50fbff24d3e
++Z 147b326af09d7b23ccf3f83204577057
diff --cc manifest.uuid
index 37c6cf3c7d,7b9871a25b..0d49487589
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8d2f52bb640d6d0f84b18d746043e56f45a73ace93239be1d036701f7f4018fd
 -7be6222c9ec44596e4eddd906c831eb1272b90fbdf68641d791f216264feb7cf
++1da302d85d7ad4ba54f877117a45d667439fd2ef31dc70ea1d54dc1fba196e68