From: drh <drh@noemail.net>
Date: Sat, 4 Feb 2017 14:30:57 +0000 (+0000)
Subject: Merge the latest trunk changes, especially the RTREE enhancement to use
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fsqlite3_blob_reset;p=thirdparty%2Fsqlite.git

Merge the latest trunk changes, especially the RTREE enhancement to use
sqlite3_blob objects.

FossilOrigin-Name: 61bd2a885da45e7fa4f02ea1c44d6706faa6bf46
---

52afa8ff0981f5869da6614e28b27b61864af10d
diff --cc manifest
index 0587ec0788,1e02448111..62f92f72e2
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\ssqlite3_blob_reset()\sinterface.\s\sEnhance\sthe\sbehavior\sof\ssqlite3_blob\nobjects\sso\sthat\sthey\scan\sgo\sactive\sagain\safter\sencountering\san\serror\sby\nrerunning\ssqlite3_blob_reopen().\s\sMore\swork\sneeded\son\sthe\sdocumentation.
- D 2017-02-02T23:57:40.053
 -C In\sRTREE,\suse\san\ssqlite3_blob\sobject\srather\sthan\san\ssqlite3_stmt\sobject\nfor\sreading\scontent\sout\sof\sthe\s%_node\sshadow\stable.
 -D 2017-02-04T14:24:05.401
++C Merge\sthe\slatest\strunk\schanges,\sespecially\sthe\sRTREE\senhancement\sto\suse\nsqlite3_blob\sobjects.
++D 2017-02-04T14:30:57.322
  F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc ba953c8921fc7e18333f61898007206de7e23964
@@@ -393,9 -393,9 +393,9 @@@ F src/printf.c ff10a9b9902cd2afe5f655f3
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c f9bc0de45a30a450da47b3766de00be89bf9be79
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c 3856db523b942062bca8722ba03b61c324ff94d6
+ F src/select.c d12f3539f80db38b09015561b569e0eb1c4b6c5f
  F src/shell.c a84e453c213f3e0d6935a582024da4e242f85a19
 -F src/sqlite.h.in 751ff125eb159c8f92c182b8df980a5e4f50e966
 +F src/sqlite.h.in 878b0f81f3f59d1f24c002127dd18740a81ba32a
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
  F src/sqliteInt.h 3724c48e82605b471bbf7e41109b5850c6e89f31
@@@ -1552,10 -1552,8 +1552,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 8e03a8e95fada5c24d369672a71f6e02288051da
- R f941c08bfee140c0cc6872a3dcf84c2c
- T *branch * sqlite3_blob_reset
- T *sym-sqlite3_blob_reset *
- T -sym-trunk *
 -P 5706d4708a30eb54da0ecbb6eb02f54746c390d9 95ee745fceb4a48c683f34c404c380fe5e7d684a
 -R ad6ed02dcc60e4bca51c672c64ac9b20
 -T +closed 95ee745fceb4a48c683f34c404c380fe5e7d684a
++P 53b77838f05b4805b956b5763c75af434662fb20 97ccf3e4de11ffea46993cb7fb7ab559b9810705
++R 2f9978803a25617be0ce666b2a1de5c0
  U drh
- Z e33493eda3d7be90d201c2b56a3ef767
 -Z c59d505acee8b5f741c72c39e5c6cdac
++Z 44ad075deb400520ebcde6cf0102f52f
diff --cc manifest.uuid
index 2222f83241,99286a49a0..53b86da15b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 53b77838f05b4805b956b5763c75af434662fb20
 -97ccf3e4de11ffea46993cb7fb7ab559b9810705
++61bd2a885da45e7fa4f02ea1c44d6706faa6bf46