Merge all recent trunk changes, and especially the R-Tree IN operator fix

of ticket [d2889096e7bdeac].

FossilOrigin-Name: 654c6c658ba7557eb822b03264bb4d259c216c01

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

diff --cc manifest
index 0d3ed281952430c9b027f49db9c0fe72f42dd9d0,36b66e55d7ca497da2489ababd6663049c6ad2d7..ffdd68282c29aaef083bbcd846bb3ca0ac975ead
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\srecent\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
- D 2014-07-24T16:43:42.826
 -C Enhancements\sand\supdates\sto\sthe\sWin32\smutex\ssubsystem.
 -D 2014-07-29T19:54:03.929
++C Merge\sall\srecent\strunk\schanges,\sand\sespecially\sthe\sR-Tree\sIN\soperator\sfix\nof\sticket\s[d2889096e7bdeac].
++D 2014-07-30T11:49:32.182
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in c1a047f376270fb6f201ca44640b43e690bc3db0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
@@@ -122,9 -122,9 +122,9 @@@ F ext/misc/vfslog.c fe40fab5c077a40477f
  F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e
  F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c 8884ffb0db17df33084b0ae2d475427a4276e383
 -F ext/rtree/rtree.c 57bec53e1a677ab74217fe1f20a58c3a47261d6b
++F ext/rtree/rtree.c 8f4190b3c53a2e9741fc367b8e7517b242e10a3b
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
- F ext/rtree/rtree1.test e2da4aaa426918d27122d1a1066c6ecf8409a514
+ F ext/rtree/rtree1.test 541bbcab74613907fea08b2ecdcdd5b7aa724cc9
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
  F ext/rtree/rtree3.test a494da55c30ee0bc9b01a91c80c81b387b22d2dc
  F ext/rtree/rtree4.test c8fe384f60ebd49540a5fecc990041bf452eb6e0
@@@ -170,7 -167,7 +170,7 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c c25678d7908d02edb1e9f7fdf9c6c8ce58f384e6
 -F src/btree.c b5531339cd826af46b9621e4a9323971a9380e12
++F src/btree.c ab2fad23fdbcdc3cdc6e687a9c62535e91eec263
  F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
  F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
  F src/build.c 48f400fa14fd6add244b954ce7e223ce7ccacf0b
@@@ -189,10 -186,10 +189,10 @@@ F src/hash.h 8890a25af81fb85a9ad7790d32
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c a038daeadfb818aaadafa854f40f5623b6929d84
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
 +F src/legacy.c 17887cec559966b62ab3673a02c427338483b147
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c 030c0fde8b64c840d9a7a93a0ef46c6f618fbb3c
 -F src/main.c bbf7f993843fc3fc496089747f6849272d77e824
++F src/main.c a7da7695351c02e3133dac77d4a84300e04e8872
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -204,34 -201,33 +204,34 @@@ F src/mutex.c d3b66a569368015e0fcb1ac15
  F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
  F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553
  F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
- F src/mutex_w32.c 9bcab6e699fdb20eae784237c36b299830fb3316
+ F src/mutex_w32.c 45020ed78735a202ff14efcf19415d29f556f16d
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 -F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
 +F src/os.c 25df79baf4bec87f75a2c4e995d63361b66b918a
  F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c a7baf1b30f3c58ba20b813e01aab23b18ae44f85
 -F src/os_win.c c29e3a80b47ebdbabd61fc3d4015e52d2654d8c5
 +F src/os_unix.c bc2bed8caed600bb76a0ab6573ae1bf3c303717f
- F src/os_win.c 43b075157eb17440a1813a14332fc8623d7c4554
++F src/os_win.c 1414edcad576a39d323bab41019b872d5b1b666f
  F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25
 -F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
 -F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
 +F src/pager.c d878c40eb8c75e9ae79b00cc80ad9710679f9a31
 +F src/pager.h 8feb18f845951ab37e1f65a319b2da24185173ac
  F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
  F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
  F src/pcache1.c 102e6f5a2fbc646154463eb856d1fd716867b64c
- F src/pragma.c 4cb718db62a35fc536bd3851682509c2588b2c0d
 -F src/pragma.c 30f3b2ac09fef58320375d78e0e18b976198fc69
 -F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337
++F src/pragma.c b7758ec0bae1223155f4ccec295754f3922ce9d5
 +F src/prepare.c 954f80160f120ca715ffa5db5549c3262abb335e
  F src/printf.c af06f66927919730f03479fed6ae9854f73419f4
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 -F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
 +F src/select.c a34db38f97bd8fe768d0bd9315397457c98be185
  F src/shell.c 191129c3f7a9cf241aea90ff6a6be3e74d3767f0
- F src/sqlite.h.in bf9910ebabd772b62ed72c40121463d3589bd4ce
 -F src/sqlite.h.in 5967719136e14183b2573ba619993438e2b9856e
++F src/sqlite.h.in 7ffe000f2b798a634d9fdb6092e053aca8d7079a
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h ea8283fbff6f3dca461f9e857ecae4a5d968ffb9
 -F src/sqliteInt.h 068e42f41a09ce6b9edbe194ac8a470ab53145df
++F src/sqliteInt.h cf62c8e9af197a3962d121230daade650e478f9a
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -287,22 -283,22 +287,22 @@@ F src/update.c 01564b3c430f6c7b0a35afaf
  F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
  F src/util.c 3076bdd51cdbf60a6e2e57fada745be37133c73e
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 2e38a1a2a02d20e461c8f1945d5021e445f42624
 -F src/vdbe.c b127f05ff110c1f640b5aff98fa57d5028c8f2ee
++F src/vdbe.c d05d3d0e46fcc07e912448bba0382e827d0a7051
  F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
- F src/vdbeInt.h f41a7cf5a40e7abd994d5fe3a04589ae3e1154e7
+ F src/vdbeInt.h f5513f2b5ac1e2c5128996c7ea23add256a301df
 -F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
 -F src/vdbeaux.c ac063f36c929f88bf6cecdbcc413000e272265bb
 +F src/vdbeapi.c 4606079c86aa9732b89b0ab6e16b6b776474a1cd
- F src/vdbeaux.c 43041ad3a91b0f213269b6dbda2ec8e963e6ad48
++F src/vdbeaux.c 34dcb2a012cc4acc7b59f3afa9606c6bb0e42538
  F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
  F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
  F src/vdbesort.c 44441d73b08b3a638dcdb725afffb87c6574ad27
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 -F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 785b8a1fdd5600f2265b57691708329cae9acbad
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
- F src/where.c 9454af8e5e18d6e91e5169eadfb61878e2cb42b1
+ F src/where.c 4dfcd80380d154be434c4b51e890e17ce9754b3e
  F src/whereInt.h 929c1349b5355fd44f22cee5c14d72b3329c58a6
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -1189,7 -1184,7 +1189,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 f426876fe1cc9ebcda5a52f823f417a4db358517 fb1048cb2b613a0dbfe625a5df05e9dcd736a433
- R 3061a8cabbc9a67aa7283b7adbadb520
 -P 8b651d4d6cde7efbc0cc7155948f477477be100e 08c9a4ea6353900095a471365a8611a443f5f399
 -R b75cbb8ba71bd17b820832cbd89e629a
 -U mistachkin
 -Z f55203ab4632e071cc6adc34ad558bc2
++P 3810dc62d2739cfd4f0dae7cea6af481cc698a0b ca9868cdae19045dc522490b34dee0f14d928ebe
++R ee0531b72a62e2874582373e75529b74
 +U drh
- Z eaf450f3a6782e11dc4d79000493a69c
++Z 2e67c811b87a5e8d626957bedf621442

diff --cc manifest.uuid
index 529121cc9eede20ac4c31d48244205f64689cb8a,2526bc68aaffb3ad0f74faae7c64ef251051d811..64b303e3183acdfc72b39f1b428d5d6431cc08dd
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3810dc62d2739cfd4f0dae7cea6af481cc698a0b
 -ca9868cdae19045dc522490b34dee0f14d928ebe
++654c6c658ba7557eb822b03264bb4d259c216c01

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge