From: drh <drh@noemail.net>
Date: Thu, 27 Jul 2017 18:49:19 +0000 (+0000)
Subject: Merge the pointer-passing interface changes from the 3.20 branch.
X-Git-Tag: version-3.20.0~3^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2036833a667ffd3df177ad99beaee7b10e968c1e;p=thirdparty%2Fsqlite.git

Merge the pointer-passing interface changes from the 3.20 branch.

FossilOrigin-Name: c63903a4c5d52a490e3f26707aa85fb54d4e2e8a3ce31ca26a9c615fe7a51e97
---

2036833a667ffd3df177ad99beaee7b10e968c1e
diff --cc manifest
index dc3d0a6c1a,6da960e7a0..5490037000
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\snew\ssqlite3.mDbFlags\sfield.\s\sFactor\sout\sbits\sof\ssqlite3.flags\sthat\ndo\snot\sinteract\swith\sPRAGMA\sstatements\sinto\ssqlite3.mDbFlags.
- D 2017-07-26T19:59:13.981
 -C Simplified\sdocumentation\sfor\sthe\spointer\spassing\sinterface.
 -D 2017-07-27T18:43:13.023
++C Merge\sthe\spointer-passing\sinterface\schanges\sfrom\sthe\s3.20\sbranch.
++D 2017-07-27T18:49:19.460
  F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
@@@ -455,10 -455,10 +455,10 @@@ F src/rowset.c 7b7e7e479212e65b723bf401
  F src/select.c c6bf96a7f9d7d68f929de84738c599a30d0a725ab0b54420e70545743cd5ee7b
  F src/shell.c bd6a37cbe8bf64ef6a6a74fdc50f067d3148149b4ce2b4d03154663e66ded55f
  F src/shell.c.in b5725acacba95ccefa57b6d068f710e29ba8239c3aa704628a1902a1f729c175
- F src/sqlite.h.in 6832630003ce858f55c750181488f30aa167870110d843035e501729a6a1c4cf
+ F src/sqlite.h.in 0e2603c23f0747c5660669f946e231730af000c76d1653b153dcf2c26fce0a6b
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 967154985ed2ae62f90d9029bb5b5071793d847f1696a2ebe9e8cc0b042ae60b
+ F src/sqlite3ext.h 0f9f72b86a3792314f5db7a1dfbc2c82376bcd8d0919ceb80637bca126ec3c68
 -F src/sqliteInt.h bd6be75bc43d38ada272ef0b3472bc44ef0cc15536bea22c349ca1a2812a19ce
 +F src/sqliteInt.h a1b8df420e8fa80fda9414ab7784d6e62271e1f7d65034ffd3e906ee6f014def
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -519,14 -519,14 +519,14 @@@ F src/trigger.c 48e0f7ed6749ce4d50a695e
  F src/update.c c443935c652af9365e033f756550b5032d02e1b06eb2cb890ed7511ae0c051dc
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c fc081ec6f63448dcd80d3dfad35baecfa104823254a815b081a4d9fe76e1db23
 -F src/vacuum.c 874c0f2f15ab2908748297d587d22d485ea96d55aaec91d4775dddb2e24d2ecf
 -F src/vdbe.c 1e541ec7ff409bbabcc6b4f154957296fff5827c16c2ab0056348acae75685bf
 +F src/vacuum.c 90839322fd5f00df9617eb21b68beda9b6e2a2937576b0d65985e4aeb1c53739
 +F src/vdbe.c ac9cc205741b295d5b77917cfd2a45632de3cd5563e143e74dce1ede42e4b68c
  F src/vdbe.h d50cadf12bcf9fb99117ef392ce1ea283aa429270481426b6e8b0280c101fd97
- F src/vdbeInt.h 19bd04a4211fe56c712ab35b48be77fd5a0579b851e9dea2cb8deade359b72b9
- F src/vdbeapi.c 52844a5a71712197be45f1c63d730c48a745c7457c959465cfb2b969af40a266
+ F src/vdbeInt.h ff2b7db0968d20e6184aee256d2e535d565f5a172e3588a78adb166a41fc4911
+ F src/vdbeapi.c 0823531191f9d5588a245ed5b39306798681814e9e8099d54a3213a13a28fbe7
  F src/vdbeaux.c 3fe68bad02b33b09e08bdc0ad90d6b92b3d571f7864c3d047abca1bde050751c
  F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
- F src/vdbemem.c fe8fce1cdc258320b465934039fe4b1230d63f81d6b81b1eac775b6eec00af0d
+ F src/vdbemem.c 9ca2854976f35db40341977e688a08204c96427505f5b90215dc7970f6ea42c4
  F src/vdbesort.c f512c68d0bf7e0105316a5594c4329358c8ee9cae3b25138df041d97516c0372
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c 35b9bdc2b41de32a417141d12097bcc4e29a77ed7cdb8f836d1d2305d946b61b
@@@ -1637,7 -1637,7 +1637,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 622b108915c7982b29ca9920abde941fff55234b70af9ac4122e4827b35d985c
- R fe59075dc94d95861d716bd3414d8c2d
 -P 5a2340b81faf0a29deb5b7c9a2ba6a7697d646de6cc4e9b2e6e5e6463fa394bd
 -R 371adde7af7e490c29a3965ed217ae65
++P 3808a00f06d372cc531da039d97bd974e4a6576a30cf63bf562f83f186b313b3 2dfcd9a8ecdf0ddd8e044d820639830c6171141c588cf0224255af85c64cf79c
++R 7fbc99c9cc153578a723e43f9966a8dd
  U drh
- Z 089964f82924e40ab601b9a240c2027b
 -Z 2e135a84e2e3ccffaa287c569d9bdf94
++Z afa3ebb0e9df1540b3b12b225ec0860d
diff --cc manifest.uuid
index c81a3cf153,27050c0dae..7944ace4b9
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3808a00f06d372cc531da039d97bd974e4a6576a30cf63bf562f83f186b313b3
 -2dfcd9a8ecdf0ddd8e044d820639830c6171141c588cf0224255af85c64cf79c
++c63903a4c5d52a490e3f26707aa85fb54d4e2e8a3ce31ca26a9c615fe7a51e97