Merge latest trunk changes, including sqlite3_db_cacheflush(), with this branch.

FossilOrigin-Name: 6e4306efaf5c0d34a1aead8ad1fe5aa836b61ca1

diff --cc Makefile.in
Simple merge

diff --cc manifest
index 3b6da548b6a9601a25f8cff8a5733cff344fe5f0,345e6cee83aa73eedf545ba3d81db5960f6ee89f..c2a5cdad932966fc14fbfd1a2f93e5633aefb214
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\slatest\strunk\schanges,\sincluding\sthe\sSQLITE_IOERR_AUTH\serror\scode,\swith\sthis\sbranch.
- D 2015-10-26T20:50:15.196
- F Makefile.in 92b9226e3675a398c7f13e67463961f31cb28ef3
 -C Add\snew\sAPI\sfunction\ssqlite3_db_cacheflush().
 -D 2015-10-30T16:14:03.663
 -F Makefile.in 4469ed8b02a9934fea9503d791165367d19db2f7
++C Merge\slatest\strunk\schanges,\sincluding\ssqlite3_db_cacheflush(),\swith\sthis\sbranch.
++D 2015-10-30T16:23:03.670
++F Makefile.in 3f4e9157bfb231338d7625610806599e4beb31b7
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -283,8 -282,8 +285,8 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c c3a9c4209439b806c44cf30daf466955727bf46c
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 4213df624323614dd79f1e5fda74a885b1955056
- F src/btree.h cf936d962b3f4179948d53ea58f3580de9b2ed0c
 -F src/btree.c 77343aac89c50bb5e06cbca3ace8c057c14de57c
++F src/btree.c 35af7ace61d9db9c93b6608fa635c3929bc28dae
+ F src/btree.h b512723e4f27d7ba16b4b985cdecdb82c0f6d0c0
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
  F src/build.c d6162335d690396dfc5c4bd59e8b2b0c14ba6285
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
@@@ -303,10 -302,10 +305,10 @@@ 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 458135ea966de50836ded1aac2e98ee856828bca
 -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
@@@ -325,12 -324,12 +327,12 @@@ 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 fc93d55f96bb978f0b0168c6ea7d6fc60b0e172c
 -F src/os_win.c 1716291e5ec2dbfc5a1fe0b32182030f1f7d8acf
 +F src/os_unix.c 5d735a657897109af9fffb6e5144de2d091b96f0
 +F src/os_win.c 1666013b5b107c70f703abece20e0e2f2137d6bd
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 8b1c29e65628361a95f7648789aa8e69f22f2d1b
- F src/pager.h 9c77ab70c5f0becfa3002016de99a73aa7b148b4
- F src/parse.y f599aa5e871a493330d567ced93de696f61f48f7
 -F src/pager.c 9c1eec0d88133484b165fa0b5284a411c24b964c
 -F src/pager.h 1c4fa826c330040c5659a384446c7cc6e8e4200c
++F src/pager.c b35877e335c9bdf9974a752d638bbfa64ed0cf31
++F src/pager.h 33a0e40fa4841096a8443d2337ca8151b6402ec5
+ F src/parse.y 11078cd8e3af00f030505b6a86a06a4536cfdeaa
  F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef
  F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
  F src/pcache1.c 902e1bc7bdaa81b40f8543407c5e2ac8ef4dc035
@@@ -341,18 -340,17 +343,18 @@@ F src/printf.c 0c4bcdd1c2e2521024f0a69c
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c dbf1fb82317043304da334a33206add211487f96
+ F src/select.c 167b4e9058bc8e997d18d6b6b20ecbb0c9c457af
  F src/shell.c d25df04168d6ba5a4fa05bdbf859df667f9eb621
- F src/sqlite.h.in 88d1a87fe01f5ba63d2efc7e3a170a9ae0a8b037
 -F src/sqlite.h.in 3cfc86c55e57c63d86b9e1e92869e2bfb162ca8e
++F src/sqlite.h.in 472ebb1316087b87e27f13c9465de5e788ae2a66
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
- F src/sqliteInt.h f97de13012ac4addbf0b11344fdb169e94ec81e8
 -F src/sqliteInt.h b1e72ffe282c91ae30a2bf403319126dbaebd556
++F src/sqliteInt.h 72eeb2eb3b62e312299cc4597dc0ebaa066182c1
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
  F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
- F src/test1.c daa42e4366b022599eae17bf1a0125b355524189
 -F src/test1.c 9ac5cbfe3c859ab7518edc5109a2959d6bf7b059
++F src/test1.c 620531c662fa0a35fab85d6e7f73091aaefd3c87
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c f7ae1d6a4aa07aac257de18a43800c1199b513fc
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -366,7 -364,7 +368,7 @@@ F src/test_autoext.c dea8a01a7153b9adc9
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
  F src/test_blob.c e5a7a81d61a780da79101aeb1e60d300af169e07
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c 099740cd40e978cdc79782b657637fefbb7177a0
 -F src/test_config.c 426527fbb12fc23669a1e973ecdc8c5e92c2e2cf
++F src/test_config.c 5b874ed96244f6d8422a217400a7ec92c80b4261
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -405,25 -403,25 +407,25 @@@ F src/update.c 40e51cd0883cb5bfd6abb7d8
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c cb8eee3953698a0a0e88963c459355ab37ac7259
- F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
- F src/vdbeInt.h 777dd76d513347acb1a71d94df2be00516add637
 -F src/vdbe.c dfbaae2570172c523bce14299021d352b8508f7f
++F src/vdbe.c b8606b0a9b15e857a67174dcec6c7f984c327136
+ F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
+ F src/vdbeInt.h 33403622c6a8feaaac5f0f3f17f5d1bf6df42286
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c 717bc2ae9cc0b58ef398fff44bd9164bfd96772a
 +F src/vdbeapi.c b13f483b1375467c367de486edf2be05234e27bb
- F src/vdbeaux.c ead8cfffad5a0bde7c795a3d231109818e1e5526
++F src/vdbeaux.c 0e5a83f4dba6ef2978c2852aa8e1e20713b7d1b7
  F src/vdbeblob.c 565fabd302f5fca3bdf3d56cac330483616a39b6
  F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
  F src/vdbesort.c 8b23930a1289526f6d2a3a9f2e965bcc963e4a68
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 -F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 929c1d7e2da94dda41e5c2fa71a919fff91ad04b
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c 0a3badc48bb89b1d80ead96081e4a9aa85e65e95
+ F src/where.c 6aceb72cc58dc06922a9e1604d559c8ca4c3e728
  F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
- F src/wherecode.c b924b78acd9e623fb69bfa2cb65cd7d542166dd3
+ F src/wherecode.c 4c96182e7b25e4be54008dee2da5b9c2f8480b9b
  F src/whereexpr.c e63244ca06c503e5f3c5b7f3c9aea0db826089ed
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -504,7 -502,8 +506,8 @@@ F test/btree01.test e08b3613540145b353f
  F test/btree02.test fe69453d474d8154d19b904157ff1db4812fed99
  F test/btreefault.test c2bcb542685eea44621275cfedbd8a13f65201e3
  F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0
 -F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de
 +F test/cache.test 0bc2195f4a7207108af2617ed356e77daf4412f7
+ F test/cacheflush.test a755c93482ce2e20c04825304bef27e7b7ea0111
  F test/capi2.test 011c16da245fdc0106a2785035de6b242c05e738
  F test/capi3.test bf6f0308bbbba1e770dac13aa08e5c2ac61c7324
  F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
@@@ -567,9 -567,10 +571,10 @@@ F test/crashtest1.c 09c1c7d728ccf4feb9e
  F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
  F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
  F test/ctime.test 7bd009071e242aac4f18521581536b652b789a47
+ F test/cursorhint.test 432811b62bd5ffb812729f49bba3b9ad687550bb
  F test/date.test 42973251b9429f2c41b77eb98a7b0b0ba2d3b2c0
  F test/dbstatus.test 8de104bb5606f19537d23cd553b41349b5ab1204
 -F test/dbstatus2.test 10418e62b3db5dca070f0c3eef3ea13946f339c2
 +F test/dbstatus2.test fc968d3005b4d827eba807a06573a6c528aa119a
  F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
  F test/delete.test e1bcdf8926234e27aac24b346ad83d3329ec8b6f
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
@@@ -1397,7 -1397,7 +1402,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 dd07688d3a478bead1174cf243fd5a667ccdda8d b4e70dd08e79decaa09f7b99e2dc7e2df92f26ee
- R 2d5f7cca0dba7164de271770c573bdd7
 -P 866f0277781dedf0db287ec5902a138406a172e3 a6695b008487aeb7badf572fa32bfcba3c9fab03
 -R ef0d31ad874159721a762aa150025fb7
++P bc195e1cd9dc1c7b97bd05cd7d0664fbc599a890 ad80d3073388c59f67171720efc6ef766e19886f
++R 26c1e36523a78c4e842623bbe1fde99e
  U dan
- Z 8244dfcc9d51d031dced1da80e878ccd
 -Z 73ca07d4c2e56cd65bf8c1c2ed88c7c7
++Z 0aaa53f0923e9fdda33db802a2f0bf34

diff --cc manifest.uuid
index a9b30fd503489778640c6be8410905ed649a6e8b,bef97ff6ba5626737287580a4a77420938cd503f..cc9e9835eda84cebf0805a4972dfeac1d43f106d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bc195e1cd9dc1c7b97bd05cd7d0664fbc599a890
 -ad80d3073388c59f67171720efc6ef766e19886f
++6e4306efaf5c0d34a1aead8ad1fe5aa836b61ca1

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge