From: drh <drh@noemail.net>
Date: Sat, 4 Feb 2017 14:24:05 +0000 (+0000)
Subject: In RTREE, use an sqlite3_blob object rather than an sqlite3_stmt object
X-Git-Tag: version-3.17.0~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe05491b8799f6e55c64a178c64b6f57eda8cf7d;p=thirdparty%2Fsqlite.git

In RTREE, use an sqlite3_blob object rather than an sqlite3_stmt object
for reading content out of the %_node shadow table.

FossilOrigin-Name: 97ccf3e4de11ffea46993cb7fb7ab559b9810705
---

fe05491b8799f6e55c64a178c64b6f57eda8cf7d
diff --cc ext/rtree/rtree.c
index 66cca987da,c46bce7d37..5ea7824e2a
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@@ -385,7 -389,7 +389,7 @@@ struct RtreeMatchArg 
  /* The testcase() macro should already be defined in the amalgamation.  If
  ** it is not, make it a no-op.
  */
--#ifndef SQLITE_AMALGMATION
++#ifndef SQLITE_AMALGAMATION
  # define testcase(X)
  #endif
  
diff --cc manifest
index 9df6e76bf0,e59dba6295..1e02448111
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Improved\sperformance\sand\sstack\susage\swhen\sprocessing\sVALUES\sclauses\swith\na\svery\slarge\snumber\sof\srows.
- D 2017-02-03T20:54:57.815
 -C Close\ssqlite3_blob\sobjects\son\sxSync\srather\sthan\swaiting\suntil\sxCommit.
 -D 2017-02-04T13:12:12.865
++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
  F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc ba953c8921fc7e18333f61898007206de7e23964
@@@ -264,7 -264,7 +264,7 @@@ F ext/rbu/sqlite3rbu.c bb0de6cdbdb14a7d
  F ext/rbu/sqlite3rbu.h 6fb6294c34a9ca93b5894a33bca530c6f08decba
  F ext/rbu/test_rbu.c 5aa22616afac6f71ebd3d9bc9bf1006cfabcca88
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c 70f2488eef5c04dccf15a52cbd4961492124f825
 -F ext/rtree/rtree.c ed39c157eab89ce014675f07601f2813c9f54e9c
++F ext/rtree/rtree.c 0c229d23ce7b9bc69365281689065f3cbbe4561e
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -1552,8 -1552,10 +1552,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 83a099f139aba03edac19c890a0019e922032a25 f5306ad6816cc377036685cdae227e762885229c
- R 907fd4e78b73041fa2c16ebe05829550
- T +closed f5306ad6816cc377036685cdae227e762885229c
 -P e51dc0ec60d45cd57564735b6b2bb254a588533e
 -R a16debe67e7399020e94d725cd2d4af7
 -T *branch * rtree-blob-agressive-release
 -T *sym-rtree-blob-agressive-release *
 -T -sym-rtree-sqlite3_blob *
++P 5706d4708a30eb54da0ecbb6eb02f54746c390d9 95ee745fceb4a48c683f34c404c380fe5e7d684a
++R ad6ed02dcc60e4bca51c672c64ac9b20
++T +closed 95ee745fceb4a48c683f34c404c380fe5e7d684a
  U drh
- Z 822640b9e481bfb5464894fc5cf2cee4
 -Z a61d538b0d9c1a9c54d88c1f71c254d7
++Z c59d505acee8b5f741c72c39e5c6cdac
diff --cc manifest.uuid
index fa2ce11638,be149e116e..99286a49a0
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5706d4708a30eb54da0ecbb6eb02f54746c390d9
 -95ee745fceb4a48c683f34c404c380fe5e7d684a
++97ccf3e4de11ffea46993cb7fb7ab559b9810705