Update with fixes and enhancements from trunk.

FossilOrigin-Name: 9605d008f5c763137e9734d033fe4510ca316858

diff --cc ext/rtree/rtree.c
Simple merge

diff --cc ext/rtree/rtreeE.test
Simple merge

diff --cc manifest
index 753486c81ec63d91d605fc1e4e11769469f004ef,405292cc6922622cf4f2937f8625fb5d2742a50b..d5c7f0dca6efe7da9c3fc8210aa099981164f062
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\ssqlite3_value_dup()\sand\ssqlite3_value_free()\sinterfaces.\s\sUse\nthese\sinterfaces\sto\senhance\sR-Tree\sto\sadd\sthe\nsqlite3_rtree_query_info.apSqlParam\sfield.
- D 2015-05-20T21:28:32.417
 -C The\sSRT_Table\stype\sfor\sthe\sSelectDest\sobject\sis\snow\sjust\san\sSRT_EphemTab\sfor\nwhich\sthe\sephemeral\stable\shas\salready\sbeen\sallocated.
 -D 2015-05-22T17:29:27.432
++C Update\swith\sfixes\sand\senhancements\sfrom\strunk.
++D 2015-05-22T18:40:48.061
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -143,7 -143,7 +143,7 @@@ F ext/ota/sqlite3ota.c 2246b779f46ab20d
  F ext/ota/sqlite3ota.h 00028de37eede471ff1947d455cc3f33d3a911c6
  F ext/ota/test_ota.c a876f88550d7d59a3ef62d4c1a5c04c4c2f1ebe1
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c 50d9df06d2b7ca946646531c20b3b627514ad832
 -F ext/rtree/rtree.c 9d9302a6ed53b3e2e2063778bf482b5243e58c23
++F ext/rtree/rtree.c 00c953695d8ae174c0f2947795e1e8a17ebb50cb
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 541bbcab74613907fea08b2ecdcdd5b7aa724cc9
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -158,7 -158,7 +158,7 @@@ F ext/rtree/rtreeA.test ace05e729a36e34
  F ext/rtree/rtreeB.test c85f9ce78766c4e68b8b89fbf2979ee9cfa82b4e
  F ext/rtree/rtreeC.test df158dcc81f1a43ce7eef361af03c48ec91f1e06
  F ext/rtree/rtreeD.test 636630357638f5983701550b37f0f5867130d2ca
- F ext/rtree/rtreeE.test b268eed6a621613fbc0a44157a8d6fe10cff3436
 -F ext/rtree/rtreeE.test ba29d4df85688fe80962baf6a23590729312b326
++F ext/rtree/rtreeE.test 45a147a64a76306172819562309681d8e90f94bb
  F ext/rtree/rtreeF.test 66deb9fd1611c7ca2e374adba63debdc2dbb12b4
  F ext/rtree/rtree_perf.tcl 6c18c1f23cd48e0f948930c98dfdd37dfccb5195
  F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
@@@ -250,11 -250,11 +250,11 @@@ F src/printf.c 13ce37e5574f9b0682fa86db
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 99eabf7eff0bfa65b75939b46caa82e2b2133f28
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 95e728e1bdbca2ee45016308e3eb6d19095155cc
+ F src/select.c 6adad8d698a382f83009eed7b73080273fa993ca
  F src/shell.c 07dda7cd692911d2f22269953418d049f2e2c0ee
 -F src/sqlite.h.in 0127e418883c2b41f7fbc056bc1033fa56fbd2a5
 +F src/sqlite.h.in f97f23de94767ab7e2c97745308920a749d4a4b5
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 -F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 +F src/sqlite3ext.h 2ebeb634e751a61a6f0eebfa0f4669f46a42f6cd
  F src/sqliteInt.h 88738d94a343000e7a5c0e295d111c4cfccb18b0
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
@@@ -1278,10 -1278,7 +1278,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 6a0cf3ce9e68d0127f9653232e588ed59d34eca5
- R bf385fc150043c4fd0764e8a32885eb2
- T *branch * value-dup
- T *sym-value-dup *
- T -sym-trunk *
 -P b9fb95194d4f7c535f1d175fd2e18d69d76e8fc4
 -R b9824a32563c5717dba8f6fd0e248f54
++P a7ee40c4fc62843ac5b96ba47ca14a66e8cd6961 b9727e6bbfc3c62c601227e86e62f2f39792fd1d
++R 9098cc91ef3cf8266e40130f2497d66b
  U drh
- Z 7924e70131eeabe4b6a3d5fe0f7548fa
 -Z 6ae4be6461472ee1a411850c6b256793
++Z 1a2a84e2d9cad97b20ef26fa2573d0ad

diff --cc manifest.uuid
index 8af005bae67407151ae9bf618b3ca64de227fb35,f4cd12aa80d8f23f440f7c66da267d23e7d43d54..09062a196ea119483c0ad5f7ff3cbc2cf981ba3d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a7ee40c4fc62843ac5b96ba47ca14a66e8cd6961
 -b9727e6bbfc3c62c601227e86e62f2f39792fd1d
++9605d008f5c763137e9734d033fe4510ca316858