Merge the latest enhancements from trunk, and in particular the

"PRAGMA cache_spill=N" change.

FossilOrigin-Name: e72331c719375dcfcfaba160f00d26e5460e9230

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 9b16325789f59e32061a2d182172581390f34e21,06f06b267c64be9a60ed6a169a2e0befb7964964..8b043169d101add832c7b5b907199d13f009ccbc
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\srecent\senhancements\sand\sfixes\sfrom\strunk.
- D 2015-11-07T01:57:44.199
- F Makefile.in 80f55546139f0123c9988d8c483270ca05e58bdc
 -C Enhance\sthe\s"PRAGMA\scache_spill"\sstatement\sto\saccept\san\sinteger\sargument\swhich\nis\sthe\sthreshold\sat\swhich\sspilling\swill\sbegin.
 -D 2015-11-12T16:44:40.812
 -F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
++C Merge\sthe\slatest\senhancements\sfrom\strunk,\sand\sin\sparticular\sthe\n"PRAGMA\scache_spill=N"\schange.
++D 2015-11-12T16:51:43.106
++F Makefile.in eebca73951f1f5827925d997e634daef95fdd364
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
+ F Makefile.msc e928e68168df69b353300ac87c10105206653a03
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -266,7 -263,7 +266,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 7c1776a0c3ab9ae4623cfb36ab63ccc7ebd54615
 -F main.mk ae99be5eb22933b1ecf80f94d41d25a3ea80aaf3
++F main.mk 99fbce4b5b6ad626f61b13baea34c73a443be17f
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -285,8 -282,8 +285,8 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 2869a76c03eb393ee795416e2387005553df72bc
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 5e5316b3c6f942c295b51b87cffc79d0206af0d9
- F src/btree.h 1b8bf2818b5e256c25a5e09126720113b1d783da
 -F src/btree.c d3bdd8462a86492e2ebc9aca4a0168429017de25
++F src/btree.c 59c8f28530850c9f94be62aa4c020d39a4de10d2
+ F src/btree.h 2d76dee44704c47eed323356a758662724b674a0
  F src/btreeInt.h 3ab435ed27adea54d040584b0bcc488ee7db1e38
  F src/build.c ca574d33ffb1763cfd2979383f4d507095bfbe19
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
@@@ -305,10 -302,9 +305,9 @@@ F src/hash.h c8f3c31722cf3277d037139097
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 419a947f27ce2da18eebf440a5aa80cc825defae
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
- F src/lempar.c d344a95d60c24e2f490ee59db9784b1b17439012
  F src/loadext.c 18586e45a215325f15096821e9c082035d4fb810
 -F src/main.c f393acc6e5d604cbe0054376d62f668a5560b3f1
 +F src/main.c dd2626547e553cf3a42994ede441e1ba0b942e72
  F src/malloc.c 337bbe9c7d436ef9b7d06b5dd10bbfc8f3025972
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -327,29 -323,28 +326,29 @@@ F src/os.c 5822c2b843a77219bba1e28887cd
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c cf72e06e15839ebe7121e01d3eebf256c039b0ca
 -F src/os_win.c 1716291e5ec2dbfc5a1fe0b32182030f1f7d8acf
 +F src/os_unix.c 93f3106e2a4f16d9c50fe4decaeddba8ad3d9fb4
 +F src/os_win.c 1666013b5b107c70f703abece20e0e2f2137d6bd
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 681ed822a9ce2aed138cca026a4ef8942e4eacba
- F src/pager.h 86484ef4aa3cbb8fe7a8a2ddcf770ba0c76757e2
- F src/parse.y 11078cd8e3af00f030505b6a86a06a4536cfdeaa
- F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef
- F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
 -F src/pager.c 18341e2b759b447cbc82fb9215d08d9c5864e92e
 -F src/pager.h 87c4118a71ba3965184148b379a6d93179071091
++F src/pager.c 93b495fb0503425bb909a01ff4f5794dbfab819c
++F src/pager.h 22bbab15f41ac42ce0b51e39a7d02eb5eb2833c2
+ F src/parse.y aad5cc866dc23719f361fe7e0b8eaec8ce4861a4
+ F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23
+ F src/pcache.h 1ff11adce609ba7de139b6abfabaf9a2bac947b5
  F src/pcache1.c 902e1bc7bdaa81b40f8543407c5e2ac8ef4dc035
- F src/pragma.c 5d97c87f05261fe3fc0fcc0be925bdbbb1b889d8
- F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a
 -F src/pragma.c 56161e4aa4891a45b534f6516acb343df15a5120
++F src/pragma.c 44e32568b4b24e6f1c7a5df87029a0ee6d0a3b34
+ F src/pragma.h 31b110aaecb5603829c97747b99abfe491df5fa0
 -F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
 +F src/prepare.c 176b060bcf36041193c2807f2b045dce1effa4bb
  F src/printf.c 0c4bcdd1c2e2521024f0a69cb5eb334f86b3652a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 167b4e9058bc8e997d18d6b6b20ecbb0c9c457af
- F src/shell.c d25df04168d6ba5a4fa05bdbf859df667f9eb621
- F src/sqlite.h.in 472ebb1316087b87e27f13c9465de5e788ae2a66
+ F src/select.c 00a2a10d4298a685d0eeb05b09ef018a2bd81bf8
+ F src/shell.c acefb4593a9bf0338a757c968f1f1bb05690d830
 -F src/sqlite.h.in fa62718f73553f06b2f2e362fd09ccb4e1cbb626
++F src/sqlite.h.in df28d4fdd2c6c902ed68bb4d0223e370f97c7d74
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
- F src/sqliteInt.h 2f6f0e90f54f3cd030be687199add9f30fa16532
 -F src/sqliteInt.h bc6d24460fe544323517630b1e20539146379077
++F src/sqliteInt.h 26cd338647e097ce907be4be1f304d380d6ba346
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -407,11 -402,11 +406,11 @@@ F src/update.c 40e51cd0883cb5bfd6abb7d8
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 7a9b18027414368d800716e6319e2acd699c70db
 +F src/vdbe.c c9869b29ad815472a1548b6772d0b26cb6976180
  F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
  F src/vdbeInt.h 33403622c6a8feaaac5f0f3f17f5d1bf6df42286
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c da9eddc62e025148e30267600a6fe3882d5e912f
 +F src/vdbeapi.c b13f483b1375467c367de486edf2be05234e27bb
- F src/vdbeaux.c 4b4bda5ee2125c742c0263bfbbb0e95e52116387
++F src/vdbeaux.c 2fab8625e7738547ebc68e43e4770e557a2a8bb7
  F src/vdbeblob.c 565fabd302f5fca3bdf3d56cac330483616a39b6
  F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
  F src/vdbesort.c 8b23930a1289526f6d2a3a9f2e965bcc963e4a68
@@@ -936,8 -930,8 +935,8 @@@ F test/pcache.test 9a04fa260cb47dd4fdc5
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test 4ea119731c62d2f7d0aa86dd5b184cbb61ca411b
 -F test/pragma.test a44253f911e7d50127d4a08f927f47c861a4c772
 +F test/pragma.test fc0c3c0ca53ad82b32c02db7000c1c6ba4449fce
- F test/pragma2.test b5e2ce4c892afceb308c6ae6163a9099b2a0d8d7
+ F test/pragma2.test a8e11a7a38e2a5053fe4b807fc806c937d9a7469
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
@@@ -1368,10 -1364,10 +1369,10 @@@ F tool/mkkeywordhash.c 37f9c2e62c31384b
  F tool/mkopcodec.tcl edde8adc42621b5e598127f8cdc6d52cfe21f52b
  F tool/mkopcodeh.tcl e04177031532b7aa9379ded50e820231ac4abd6e
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl 84af2b180484323a2ea22a2279e8bd9e3e1e492e
+ F tool/mkpragmatab.tcl 473b6a156bc018d36aac5288d8479a879d570b93
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
 -F tool/mksqlite3c.tcl b66b4170f693602cd6985aed15d9509fe2f18c84
 +F tool/mksqlite3c.tcl a4f564e10c919d35dcf0f1b87d16be2cbb082bd7
  F tool/mksqlite3h.tcl 1d41ab59bffb025121f75b76e183125ce41b3ec8
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl bbe57cd9ae11c6cc70319241101ef8d2b8c3765b
@@@ -1405,7 -1402,8 +1407,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 447521d747d94fa3028348bc48b897592fd8021c 0f5b147d1fe83c34d0fbeacc7422be94d8441bc1
- R 01a4b895013e0ddf07a1438acec26883
 -P f84e3085c87cfffe4aba0eb4c4a3298b4027db83 9a431362dccbc9b8f93375f30a3b8955903cca79
 -R 5f87cb60f8f27cae7787baa81cd88247
 -T +closed 9a431362dccbc9b8f93375f30a3b8955903cca79
++P 5429f99b98ea1e2ecf5f50dade52009adc431a12 f79d264db24a470d1a4571e15a99cd3d68b5166c
++R c9bab7d89b880c5e9e8651e2cdfa3e57
  U drh
- Z 74d3bc6036689b4e3991ad6c9e774d5d
 -Z c0a66dbf9634d84e657f233ea4ee622f
++Z d3a734ab8d244dee8bcc5fe982e7b755

diff --cc manifest.uuid
index d171dd39617522864a81cd0cc19f80fd4d74d50f,9052b6aab838884ebdc0fc487d5a7761c77231b5..3e913f7d7039a3146d3fe948d37735cf66de5504
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5429f99b98ea1e2ecf5f50dade52009adc431a12
 -f79d264db24a470d1a4571e15a99cd3d68b5166c
++e72331c719375dcfcfaba160f00d26e5460e9230

diff --cc src/btree.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
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/vdbeaux.c
Simple merge