From: drh <drh@noemail.net>
Date: Wed, 9 May 2018 15:19:41 +0000 (+0000)
Subject: Merge from trunk the ability to use sqlite3_sql interfaces in extensions.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59161f1d4f36f9c229d37fddd10364ca3f9dbbcb;p=thirdparty%2Fsqlite.git

Merge from trunk the ability to use sqlite3_sql interfaces in extensions.

FossilOrigin-Name: 5bb9e6a9f19f9d73314b08afbecb13f46b0cf7b27bfb567960d8f60e3a7a74a1
---

59161f1d4f36f9c229d37fddd10364ca3f9dbbcb
diff --cc manifest
index e86adf5c12,e3e4b89d52..bb63b6e40e
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\sgeopoly_json()\sinterface.\s\sUntested.
- D 2018-05-09T15:00:36.551
 -C Add\s14\snew\sinterfaces\sto\sthe\sloadable\sextension\smechanism.
 -D 2018-05-09T15:17:02.669
++C Merge\sfrom\strunk\sthe\sability\sto\suse\ssqlite3_sql\sinterfaces\sin\sextensions.
++D 2018-05-09T15:19:41.906
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@@ -1729,7 -1728,7 +1729,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 f3609aefe877544c93c556840fe9a129f0680681eea0c64c084b20217dd2191e
- R dcdac1776ea78ea7472ff7a0677655bb
 -P 43ea8a6836ccb9910314d35e07d881694200c97ef5969629f62e49f7a2a42f92
 -R 0ab9d818caff0518c7251a9db9ba4fd3
++P 25695c80a01d18bc533d6c741076452dfc0063b1e632da346e254062ec01acbe 0e809cdcbd1bb1e269298814d6bb1dcdaea48c5b0bb20e0e1caa4dba27654873
++R 0200861d14387bc336ac9e6d2f852523
  U drh
- Z 0605743283407c8ba6d4bf76a23108f0
 -Z 45890a3e9e7826346aa8f68581c4f2f3
++Z fb13d8bc92e12d2d3ea6a5bd13f1350a
diff --cc manifest.uuid
index 08afa8abc1,8c0653b8f9..2f192c2231
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 25695c80a01d18bc533d6c741076452dfc0063b1e632da346e254062ec01acbe
 -0e809cdcbd1bb1e269298814d6bb1dcdaea48c5b0bb20e0e1caa4dba27654873
++5bb9e6a9f19f9d73314b08afbecb13f46b0cf7b27bfb567960d8f60e3a7a74a1