From: dan <dan@noemail.net>
Date: Fri, 13 Sep 2019 16:19:53 +0000 (+0000)
Subject: Merge latest trunk changes with this branch.
X-Git-Tag: version-3.30.0~58^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=945a3527d5edd76dbb2dd0839434caf2d9c06024;p=thirdparty%2Fsqlite.git

Merge latest trunk changes with this branch.

FossilOrigin-Name: 14ef7543465dd14d8fa141fcceb1950b5c2d265a3e862323969d747b39c0cd8c
---

945a3527d5edd76dbb2dd0839434caf2d9c06024
diff --cc manifest
index c6971bfccb,f7bb1bed41..db8ec644a2
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\sSQLITE_SUBTYPE\sflag,\swhich\scan\sbe\spassed\sto\ssqlite3_create_function()\sand\ssimilar\sto\sindicate\sto\sthe\score\sthat\sa\suser\sfunction\sis\slikely\sto\suse\ssqlite3_result_subtype().
- D 2019-09-07T18:20:43.736
 -C Ensure\sthat\sthe\sidxStr\sfor\sFTS5\sis\salways\szero-terminated.\nFix\sfor\scheck-in\s[e6db945454a0dae2]
 -D 2019-09-13T13:23:13.490
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2019-09-13T16:19:53.303
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -524,12 -525,12 +525,12 @@@ F src/printf.c 9be6945837c839ba57837b4b
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 9891cf5fd155bb199f8b1ff5d1429b9f70484487f4c455bba94348d4cb6f829f
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
- F src/select.c e4fe08c3da81a38061454fb7de2c1b31c36ed76cd1a4bbefd2b5fc4ebb472a5b
+ F src/select.c e2c870548541d33d090a066e89ab2e7943299006e2827c1abfae39561041fc0b
  F src/shell.c.in e5fb91505f29ae9458cabf1a63bbd1faf6b4b34eabca33d0f75a06aacecca21b
 -F src/sqlite.h.in 50fc0914ccd347437db9a0278a47d7541df3a45eb6e641e9680750c6f98dad27
 +F src/sqlite.h.in aa8eab4a0ad30e10be68223469edbc9add18a6d01bd25ef63015379cabe572ec
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h cef696ce3293242c67b2339763608427bf72ee66f1f3a05389ac2a7b46001c31
 -F src/sqliteInt.h b1fca535f01f02ae6927dd44e760c6ab54c7a181e88f813d16b55a1bc95d13c0
 +F src/sqliteInt.h 34cc038470f74a961ce9c1155df4c3926c2c88d784631272943ae0b7e9bd2aa2
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1840,10 -1842,7 +1843,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 cb3e2be674316e1d39968eb6567f1fe1b72f9d89af49640a9e83f944979c4cf0
- R d1b9853f176533fc61f0716439115fae
- T *branch * window-functions-subtype-fix
- T *sym-window-functions-subtype-fix *
- T -sym-trunk *
 -P a8927d14f88c44828e794787bab080455ab62705c93f65ce7d8db83478aa5a8e
 -R 1b0d381d385e92afee32191d4d702401
 -U drh
 -Z bf931f65c31f45c41d3fdaadb23bca9e
++P 6aa438ce41d460a6782ae63503128b9140c28ff59c2b2eed48b004acf83e0560 090cd07d37904da4610d6a6787a3cc825c9a8bdcc5f051267d4608bba9b49d03
++R fd375c2e1dff51c5d7012fa4142e0ead
 +U dan
- Z 3b4f60d3aa156d677d66f1a5addfe61e
++Z df1ac0a87aa9a51acfc9b062c58caddf
diff --cc manifest.uuid
index fa760b9d20,528dcf10a8..806de71a2d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6aa438ce41d460a6782ae63503128b9140c28ff59c2b2eed48b004acf83e0560
 -090cd07d37904da4610d6a6787a3cc825c9a8bdcc5f051267d4608bba9b49d03
++14ef7543465dd14d8fa141fcceb1950b5c2d265a3e862323969d747b39c0cd8c