Merge recent trunk changes, and especially the fix for the R-Tree problem

described in ticket [d2889096e7bdeac6].

FossilOrigin-Name: 8f1beeade0ddf802900c9d203a4fd678d1190394

diff --cc manifest
index 918ba1dafc3e49ba383267dbff5c4b624e53fb64,d1716a2069cb201a88bdb9020d298725af7392e7..b9a388624229fca813eada62bee568f064c31ffb
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\srecent\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2014-07-24T16:23:51.251
 -C Have\scalls\sto\sthe\sxFilter()\smethod\sof\srtree\svirtual\stables\sensure\sthat\scursor\sis\sinitialized\sbefore\sproceeding.\sFix\sfor\s[d2889096e7bdeac].
 -D 2014-07-29T11:54:18.063
++C Merge\srecent\strunk\schanges,\sand\sespecially\sthe\sfix\sfor\sthe\sR-Tree\sproblem\ndescribed\sin\sticket\s[d2889096e7bdeac6].
++D 2014-07-29T12:40:45.487
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in 639859a6f81bd15921ccd56ddbd6dfd335278377
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
 +F Makefile.msc d389ce1d436d21a93a9f5f6211dc45e4b8860962
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
@@@ -238,10 -224,10 +238,10 @@@ F src/resolve.c 5fc110baeacf120a73fe34e
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
  F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
  F src/shell.c 191129c3f7a9cf241aea90ff6a6be3e74d3767f0
 -F src/sqlite.h.in ac4451c9da2771d2f4d702ef89722407242906d9
 +F src/sqlite.h.in a7cfafa4874726efb9ae51a88770a9de8b21a42c
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 83f438c59867d023c9d555243706a9edb4945662
 -F src/sqliteInt.h 068e42f41a09ce6b9edbe194ac8a470ab53145df
++F src/sqliteInt.h 56c7fe562722601d83a53bd8b5262a975851bf95
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -297,12 -283,12 +297,12 @@@ F src/update.c 0f16e1d55d642a7ae3199bd0
  F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
  F src/util.c 3076bdd51cdbf60a6e2e57fada745be37133c73e
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 7224ed5d23599e0bc57b79d03901e4b86d609da1
 -F src/vdbe.c b127f05ff110c1f640b5aff98fa57d5028c8f2ee
 -F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
 -F src/vdbeInt.h f5513f2b5ac1e2c5128996c7ea23add256a301df
 -F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
 -F src/vdbeaux.c ac063f36c929f88bf6cecdbcc413000e272265bb
 -F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
++F src/vdbe.c 3d1953149725e74ac76e8c3556f455513f6e3e57
 +F src/vdbe.h ca3b6df299adce6e2f499c57e42ae54f142ae823
- F src/vdbeInt.h 31b5cb53bd7f7fda3805a323c970da65fb5a5efc
++F src/vdbeInt.h 5eee1752eff410de9373196e2b327f7deefb3920
 +F src/vdbeapi.c 52335de5ff97bba93d6779d8df87feab5d53d7df
- F src/vdbeaux.c f7ef74c5fb7f3da380b719ecbf9f23e558b099d3
++F src/vdbeaux.c c034933f1d417e333d07b63e5a4623cbaeccb361
 +F src/vdbeblob.c d7c232d1c6afc7ee1176c38b7d81b2e17af15ceb
  F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
  F src/vdbesort.c 44441d73b08b3a638dcdb725afffb87c6574ad27
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
@@@ -1199,7 -1184,7 +1199,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 a5d94eaba6aa12ff16d2a0af2fc752bcdb461877 fb1048cb2b613a0dbfe625a5df05e9dcd736a433
- R ccf3fca6dda4e0dab5dd164f413978b7
 -P 5350229b52b18a4961858a30538c5c75e5bd3048
 -R 0da0b70a772b464fda61490d5328a931
 -U dan
 -Z f2b0f473c1ab5a411c1b4bc1349722f0
++P a9db017eabdefafcda87c497e8bafa07002ac0fe 8cc41b0bf365af47c2061ffe44c86018945dd239
++R 397e9c937f93489d3db975d7840d7883
 +U drh
- Z 6de22260129246198d4b45e0c941be73
++Z 2a6be15adfeaf45265e0181bd2c8489c

diff --cc manifest.uuid
index adc84ab064a3cc49420c1a3cec903c3f7512d534,b934c9dde556f336dcb7a83c95f5e9bbe0bb1e8e..9725c5f1b7788313cebc60977e3fb9b6aaa91777
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a9db017eabdefafcda87c497e8bafa07002ac0fe
 -8cc41b0bf365af47c2061ffe44c86018945dd239
++8f1beeade0ddf802900c9d203a4fd678d1190394

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge