Import from trunk support for SQLITE_CHECKPOINT_TRUNCATE and fixes for

a couple of obscure bugs.

FossilOrigin-Name: 463ad971d2a427f50564b409a021a910004c1423

diff --cc manifest
index 7f0b08dfca4ca5dcb7dc0a7154076d58b1b651b3,e3691737da27fa49c52c59fbf9faf74b0234eff6..412632c23f35019bfd29833dcfb207d3257f2d0d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sall\srecent\senhancements\sand\sbug\sfixes\sfrom\strunk\sinto\sthe\sapple-osx\nbranch.
- D 2014-12-02T16:38:43.733
 -C Make\ssure\sthat\sa\sDISTINCT\squery\swith\san\sORDER\sBY\sworks\scorrectly\seven\sif\nit\suses\sa\sdescending\sindex.\s\sFix\sfor\sticket\s[c5ea805691bfc4204b1cb9e].
 -D 2014-12-04T21:54:58.307
++C Import\sfrom\strunk\ssupport\sfor\sSQLITE_CHECKPOINT_TRUNCATE\sand\sfixes\sfor\na\scouple\sof\sobscure\sbugs.
++D 2014-12-04T23:42:28.717
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in a226317fdf3f4c895fb3cfedc355b4d0868ce1fb
 +F Makefile.in 73a6c2ce505d58bbb21bb703402fbe61fb8b4fd5
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 788f1288633a0c3c3cbbe0f3e4827d033f7ba530
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
@@@ -185,20 -182,20 +185,20 @@@ F src/complete.c c4ba6e0626bb94bc77a086
  F src/ctime.c df19848891c8a553c80e6f5a035e768280952d1a
  F src/date.c 93594514aae68de117ca4a2a0d6cc63eddf26744
  F src/delete.c 0750b1eb4d96cd3fb2c798599a3a7c85e92f1417
- F src/expr.c 73de4c0da2eed6b149d40a05c589dfeb2c4a87a1
+ F src/expr.c 00da3072f362b06f39ce4052baa1d4ce2bb36d1c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
 -F src/func.c 6d3c4ebd72aa7923ce9b110a7dc15f9b8c548430
 +F src/func.c e331a645ae437de0089d9789f678073a114c804d
  F src/global.c 6ded36dda9466fc1c9a3c5492ded81d79bf3977d
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 5b9243a33726008cc4132897d2be371db12a13be
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
- F src/main.c b847849c44bf2abf91efdda78f21fb31b22fd802
 -F src/main.c 84cc0fc4861bd2b06c286b38bf03bce604a0a66a
++F src/main.c 5855a994c415e29aeb7b97f410468dec61bf2338
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@@ -216,33 -213,32 +216,33 @@@ F src/os.c 5822c2b843a77219bba1e28887cd
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c fb587121840f690101336879adfa6d0b2cd0e8c7
 -F src/os_win.c a9e500dd963fb1f67d7860e58b5772abe6123862
 +F src/os_unix.c 2af3813fd2df6f5d016d1dfef541d2c9e98fd600
 +F src/os_win.c 1a38ad1288b4b263c85d124093b8a6f59702925b
  F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
- F src/pager.c 7663d83bdf3776f3cc91fcefbd4722d4f4af66ac
 -F src/pager.c 7a5c5bc0e29b9b16834f5558a9d5d22bbae59a08
 -F src/pager.h d1eee3c3f741be247ce6d82752a178515fc8578b
++F src/pager.c 0bfd3ceb7254cca749866f852412984f81c2389d
 +F src/pager.h 78ba46ce1f98b9a9791f4b39e52aedd6ed988472
  F src/parse.y 5dfead8aed90cb0c7c1115898ee2266804daff45
  F src/pcache.c ace1b67632deeaa84859b4c16c27711dfb7db3d4
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c facbdd3ecc09c8f750089d941305694301328e98
- F src/pragma.c c63b5aa7b655801cf74b7f94fdb136f4d9626522
 -F src/pragma.c d54cdd40b63d608f2d95b7482c710690e3593a73
 -F src/prepare.c b7b7bf020bd4c962f7c8aed5a3c542c7dfe9f9c7
++F src/pragma.c 0de5c12a996108c3ffd4ce0a6be7a1d2e5ae5450
 +F src/prepare.c 307a3ddc2f087df85114c5e4bfcc4a55c9970cde
  F src/printf.c 9e75a6a0b55bf61cfff7d7e19d89834a1b938236
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 4965007d6497b6a4d7a6d98751cc39712885f952
+ F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 00edeea62174d9fc5e010e0044f2af64233cf602
 -F src/select.c f377fb8a5c73c10678ea74f3400f7913943e3d75
++F src/select.c 4f48f3b05e5c8aa272a13b79645a0b308caef9dc
  F src/shell.c 45d9c9bd7cde07845af957f2d849933b990773cf
- F src/sqlite.h.in 8e134856471d5f3ed9fd23121369ac6a93b2f042
 -F src/sqlite.h.in 6ec654324cb490ea3d8a7be28b8c7d37fe4ad282
++F src/sqlite.h.in 58d18cf47b056ba56ed2c566c783026bc742ea2c
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 67297342e0cbac5af4d5bc94c5b8460757a11213
 -F src/sqliteInt.h 28049b803b74a7f73242a8226915ea00ebb1309f
++F src/sqliteInt.h be4da0e05d15aa60ce50994c51856e31e4ee405c
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
  F src/tclsqlite.c 0a874655dd39a9875e39c5d3c464db662171d228
- F src/test1.c 169a6be750c4c56896ff1b111f1e68a09795d2c3
 -F src/test1.c f5d7ecd3dd663b11f35269fd91f7090db0570903
++F src/test1.c 2322857b226535269e92656a9f0ab80117d21d2a
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -295,22 -291,22 +295,22 @@@ F src/update.c 3c4ecc282accf12d39edb8d5
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
  F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
- F src/vdbe.c 8a4609393b10b07ca2783409cb7915ed4bac154a
 -F src/vdbe.c 1a9e671c9cfc259e4d2affc71f7df4a4c00a842c
++F src/vdbe.c 9f43973c08d115f5fbe46fe30663e536018d7b43
  F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
  F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
 -F src/vdbeapi.c 07acb615d1e4170e71fc1b0d087f3c53a1ad8e83
 -F src/vdbeaux.c 6f7f39c3fcf0f5923758df8561bb5d843908a553
 +F src/vdbeapi.c 55cd14500f305264983952b816d3d3ce91501b3a
 +F src/vdbeaux.c 6f91a25abf07dbbda79c155e5ae8860816dcef13
  F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
  F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
  F src/vdbesort.c 42c166f7ca78cb643c7f4e4bdfa83c59d363d1a6
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
- F src/wal.c d7c4c36a21d41c8470f78f58a6ccd5f766067ed6
 -F src/wal.c 847692349eb6e1fb8543dbc97e69ddbfa4cc7ea7
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
++F src/wal.c 75f2d8b18c846910406da9700e7dd4fc67b76030
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c a0b16f9d78321cb340a977287d19f826555c7d3b
+ F src/where.c d67fe69dd1bb32ad3d488a8c5bc803a29814f357
  F src/whereInt.h d3633e9b592103241b74b0ec76185f3e5b8b62e0
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -1114,32 -1109,32 +1114,32 @@@ F test/vtabF.test fd5ad376f5a34fe0891df
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test ea8778d5b0df200adef2ca7c00c3c37d4375f772
 -F test/wal.test 885f32b2b390b30b4aa3dbb0e568f8f78d40f5cc
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 -F test/wal3.test b22eb662bcbc148c5f6d956eaf94b047f7afe9c0
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 174cc1512e304a7dfa28ac30527e28ea02fc37df
 -F test/wal6.test 527581f5527bf9c24394991e2be83000aace5f9e
 +F test/wal.test 0ae504805b7e41b64a55fb5b7745de5ca2a0db2a
 +F test/wal2.test 703b87c21c1e3e169d607158de414c7c2655b93e
 +F test/wal3.test de822707fbc8e9d056edc895adfb8abcccee4590
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
- F test/wal5.test da70332902b19fea23b74c657a941a180e1cb777
++F test/wal5.test eeb8ba1318370bce8c89ac6eb2f65be1e32b8db4
 +F test/wal6.test 54ac71d59046014c70ad78957139984c5bfb7eb2
  F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test 75c42e1bc4545c277fed212f8fc9b7723cd02216
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test c35dd183708148120928dca908641c361f58062c
  F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 -F test/walcksum.test 9afeb96240296c08c72fc524d199c912cfe34daa
 -F test/walcrash.test 451d79e528add5c42764cea74aa2750754171b25
 -F test/walcrash2.test a0edab4e5390f03b99a790de89aad15d6ec70b36
 -F test/walcrash3.test e426aa58122d20f2b9fbe9a507f9eb8cab85b8af
 -F test/walfault.test 1f8389f7709877e9b4cc679033d71d6fe529056b
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 -F test/walro.test 34422d1d95aaff0388f0791ec20edb34e2a3ed57
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test 67339b9e54db0cdaaf21287349bc8056e2919f96
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
 +F test/walcksum.test 932d12a2a36fb2765560d35e7eaa1e5f0b198385
 +F test/walcrash.test 011e05e9170da888851cb9ec4276bb1894ad32e3
 +F test/walcrash2.test 6eb6842d34cc5955726264c80566963c32a9cbea
 +F test/walcrash3.test 279640ffafa23f7564529ccd69bfb97849ccae9d
 +F test/walfault.test f4160abd02d583d06d7ea9554e7a3f749f6b3410
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
 +F test/walro.test 256ea9380825a34be43e8ff02bd1e240f1f62e8c
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 658066419a92d3bd85be71a11ce477af4ffe9153
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test 28b64e93428961b07b0d486778d63fd672948f6b
  F test/where2.test 23fdb5d8e756554aad4ca7ae03de9dd8367a2c6e
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
@@@ -1228,7 -1223,7 +1228,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 ccb601f6dffba68a57d82db2d046aa27f6f1b755 61b31e771430f490fc2c4cef55046debc4a5f4f5
- R 3494967f4777b590bf91695bcd03afdd
 -P 1461d543ac8a3e4a54405067893146c74576bb4e
 -R fc5b0159564faa200a156d134ab758df
++P 43c4ba26a20ca0230d898a6431ed9ae5cfdb63d3 0d3aef97ebddf422b8bdcbc5878970c6129e3f54
++R 358aba7ceaa84d8889281503fc35c381
  U drh
- Z 6c52a71410820e5dbd946b25806390e2
 -Z 018f1b0eb45096a13f52fc7d70ef2bc6
++Z 35f5e2756c80a1bd34c5e223871aa152

diff --cc manifest.uuid
index 8a2b50f3d4cc3c8fe1754fdd37f4fae912cc8da3,7416b1cda363c841763bdd9293d3ba4eca143ef2..a53c7ce78882288475b6ab066bad4f414fc13ab8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 43c4ba26a20ca0230d898a6431ed9ae5cfdb63d3
 -0d3aef97ebddf422b8bdcbc5878970c6129e3f54
++463ad971d2a427f50564b409a021a910004c1423

diff --cc src/main.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/select.c
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/vdbe.c
Simple merge

diff --cc src/wal.c
Simple merge

diff --cc test/wal5.test
Simple merge