Merge the virtual table query planner enhancement, the RTREE cost estimate

fix, and the statement journal spill delay enhancement from trunk.

FossilOrigin-Name: 17fd8f3cf0ec565e08403dc8e10a1cffc2bbe165

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index b62147b7cf81cf1518fcffd5dd4e6f2dd95673ed,6cf99353de90fd4b6b25eb69cfd078865d72cd0a..ee71dadf9a6ff6ec50189b239ce7b2651e5a51fa
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\srecent\senhancements\sfrom\strunk.\s\sDefault\spage\ssize\sis\s4096.\s\sWrites\nto\sstatement\sjournals\sare\savoided.
- D 2016-03-04T16:42:43.133
- F Makefile.in 055473c5b509b37ae18d4c3ed39af4b124476f0d
 -C Add\sthe\sSQLITE_CONFIG_STMTJRNL_SPILL\soption\sfor\ssqlite3_config().
 -D 2016-03-07T17:37:37.281
 -F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
++C Merge\sthe\svirtual\stable\squery\splanner\senhancement,\sthe\sRTREE\scost\sestimate\nfix,\sand\sthe\sstatement\sjournal\sspill\sdelay\senhancement\sfrom\strunk.
++D 2016-03-07T17:49:17.995
++F Makefile.in e812bb732d7af01baa09f1278bd4f4a2e3a09449
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc ea016bfc6d772cb81c2ba2722460937f04ae07f9
 -F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
++F Makefile.msc e6ee58b849c116d5554024f524cbf61f064f6f01
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION c6b1f51809551d60ad001e6d87cf3ab2c7f54b6f
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -293,7 -273,7 +293,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk b61722224cf37810ee3160a5c3f927e1a90cc25b
 -F main.mk 91cfc30d0fa295be28a86657ad3b1053f0428c9e
++F main.mk 942e1fd30eb352492cf599aa7fcb5334783e4cbf
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -321,20 -301,19 +321,19 @@@ F src/complete.c a3634ab1e687055cd002e1
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
  F src/date.c 0b73e681c11fca867fec554750c07fe0d4e417c1
  F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b
 -F src/delete.c 48802aa3ee6339f576d074336d3ae1b5f40e240f
 +F src/delete.c eeac28b3d3d88e3541bdf93e91ea7492a7b67842
  F src/expr.c c4dad2cd6cec00387b75fef4551aff655430dcd2
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 -F src/fkey.c 5cb42d9a59e2a590776fd3fc8ff6f61d40df3c6e
 +F src/fkey.c 5da47ff524e2f687997a74737ce598f043e1342a
  F src/func.c 552d300265aed09eea21f68ac742a440550c0062
- F src/global.c ded7b97efd16efda5062b65e857198e46c40e652
+ F src/global.c 884d4c7eba9f5fc25c96a23b21520da19b7713e2
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
 -F src/insert.c 723d5d708cdb61bdd47c00b9f07c75be45aefc09
 +F src/insert.c 8f4e9fcbd8e95e85f15647ba8b413b18d556ec2b
- F src/journal.c 673cbdde5676eb0c55848f561575d45b609c820d
  F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
  F src/loadext.c 9e2a41adcaff16ebc1ebff1f336cbf33de55396f
- F src/main.c 56edbba4bd69e5f650bd75ae45f1a7d081e1e892
 -F src/main.c 93c571d78bc41b257f36912e678db4817d3c540e
++F src/main.c e5675877b35bd894e5803588974fc59369d5a6f2
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -370,11 -349,11 +369,11 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
  F src/select.c 137b31daa84d57d67847bf621bb54f3353e2077b
 -F src/shell.c 5e0ab1e708dc294330ccd8230536e1801f60822e
 -F src/sqlite.h.in 0235586b3fb639e85998d495c90f007657fd82af
 +F src/shell.c cd3f82fdc5c895b817a375b7ab8319cb41f447ce
- F src/sqlite.h.in a51577ed847b75fff9c10b7ea35e37e8154cee71
++F src/sqlite.h.in 86884a006a451c22d342da18d8e373aa70e65ec0
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h b0e28df3739ef7113eb1297db0766abf74635c90
 -F src/sqliteInt.h 8c32c1f4566c577cfb8e1c96e56f61e8b3e780d7
++F src/sqliteInt.h cd85b90d949c7270266f997ed9796371e6019c53
  F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -391,10 -370,10 +390,10 @@@ F src/test9.c bea1e8cf52aa93695487baded
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
- F src/test_bestindex.c cd36324f05404df5f1a82608a321b91932a549ea
+ F src/test_bestindex.c 29af3cc3b963ffe5760c85d142b9b3e5302c1e3d
  F src/test_blob.c b2551a9b5573232db5f66f292307c37067937239
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
 -F src/test_config.c 0dee90328e3dedf8ba002ee94b6a7e7ea7726fe4
 +F src/test_config.c a0e8eeb86a7d9393f3bbf7315932c1cccd0e8010
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c f10f840ca4f8c72e4837908bd8347ac4bcab074b
@@@ -431,17 -410,17 +430,17 @@@ F src/threads.c 4ae07fa022a3dc7c5beb373
  F src/tokenize.c 3d338cdd00d916ce8a05c397001d64ed58e6fe1c
  F src/treeview.c e4b41a37530a191579d3c53142cc44ee2eb99373
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
 -F src/update.c a7eeeaffad59c6506f01303a071dac11de8269ca
 +F src/update.c c0016d277a418360456ff6af29363effbd4272f7
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c a64585a74aef6feb16dfe4e090b5de01e26eba3b
+ F src/util.c 12800a93f0664f41575f96799eb881a786d565e6
  F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
 -F src/vdbe.c 87ae3a5657fefed7875f3eb30e7ababd48013d71
 -F src/vdbe.h c743791f723049db94f009e3e30958952bc2d512
 -F src/vdbeInt.h 49a74fe5ece206d2d8666ba9afaf1abeda5f123b
 -F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
 -F src/vdbeaux.c 2c15cf88de4df97428318c8cfac0dea873dae451
 -F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
 -F src/vdbemem.c 9b0cb32cc267ef026515f15a3594d5ff91fe4dfc
 +F src/vdbe.c 9ccb138cb7ac6c1bcda23dfaf52eff1f7761dfe5
 +F src/vdbe.h 594aef1a7dcfc2944e2f266f148140c3427fd0f0
 +F src/vdbeInt.h a205ce1ece3ab90be78a374e93cb5402fccdf865
 +F src/vdbeapi.c ba85b78fe08dc4a9ce747e62c89a2b4a4547e74c
 +F src/vdbeaux.c 325dcf1b944e6d339a5c5210b7b8c5724a8496fb
 +F src/vdbeblob.c c9f2f494b911c6fa34efd9803f0a10807da80f77
 +F src/vdbemem.c 0bcc4af472ebd36e57603d733a6501573a82b526
  F src/vdbesort.c 307460bfa4de4d1c3901fcd42089159131e34062
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c fd69fd398e23e57ea4ea377d8a44b6998fc569c7
@@@ -1417,8 -1396,8 +1417,8 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl f0d5bb266d1d388cf86fce5ba01a891e95d72d41
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
- F tool/mksqlite3c.tcl a52d7e8c0888f9384fbfa2c6ddd5f357409758b9
 -F tool/mksqlite3c.tcl 9382100c82a0a08e63265780536a6c8efead4b65
 -F tool/mksqlite3h.tcl 1d41ab59bffb025121f75b76e183125ce41b3ec8
++F tool/mksqlite3c.tcl 63af8429841f08552e6da1d93b3dee4a93ff8071
 +F tool/mksqlite3h.tcl e7b106fc4f29fbc258e8ba9b88d9108332ea2ade
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 4abcaf3267171b2faadaf9b82a0dfbaa6e98f8b7
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1474,7 -1453,7 +1474,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 8fea1166016c659ece83e0045bc348f478a9ba6a cb9302cca423de41305719a49208daa392ec09da
- R dd40074d0cb69f94c136cb2921dcb114
 -P d8d89d69a490a708b83147945f74134ae0e4b387
 -R bbf6d9fea009c5097a1f1af27ba30392
++P 456df3365e2df60e34762f2024bb551538b3f72b b6c4202432dc96f8f1740f52d0bf872116357fcc
++R 2f497816caa21168c1331f3fb71a39ba
  U drh
- Z 1bfaeec3e683dbb2e879f4e9437ca024
 -Z 638bda7b36ac0921edfae65baff4e139
++Z a204fd45fac574847e4285c8445e5721

diff --cc manifest.uuid
index a33810a4c55804551a764e7fc8aa8bfedb2af4f3,9a5e54bf8523571aeb77216acbb320520c1cd0c9..4c042e9489ec1676c91ade75b7e71a6d20494da4
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 456df3365e2df60e34762f2024bb551538b3f72b
 -b6c4202432dc96f8f1740f52d0bf872116357fcc
++17fd8f3cf0ec565e08403dc8e10a1cffc2bbe165

diff --cc src/main.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge