Incorporate the SQLITE_CHECKPOINT_TRUNCATE enhancement and a couple of

obscure bug fixes from trunk.

FossilOrigin-Name: 34ffa3b3c002b0e87d8382ad76e87dbaec0b2bc6

diff --cc manifest
index f563572da142e559ee04b2abab623040ee12eb8f,e3691737da27fa49c52c59fbf9faf74b0234eff6..6ebd011b8777d7ada92f08a2c37a0832f8f3cd01
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\srecent\sfixes\sand\senhancements\sfrom\strunk\sinto\ssessions.
- D 2014-12-02T16:31:01.447
 -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 Incorporate\sthe\sSQLITE_CHECKPOINT_TRUNCATE\senhancement\sand\sa\scouple\sof\nobscure\sbug\sfixes\sfrom\strunk.
++D 2014-12-04T23:35:08.510
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in a226317fdf3f4c895fb3cfedc355b4d0868ce1fb
 +F Makefile.in e2007fafb7b679a39800a1d636dcc6662a840530
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 788f1288633a0c3c3cbbe0f3e4827d033f7ba530
 +F Makefile.msc 64f7ba446298db653fc195ad7699e4b06863d9c4
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
@@@ -198,8 -181,8 +198,8 @@@ F src/callback.c 7b44ce59674338ad48b0e8
  F src/complete.c c4ba6e0626bb94bc77a0861735f3382fcf7cc818
  F src/ctime.c df19848891c8a553c80e6f5a035e768280952d1a
  F src/date.c 93594514aae68de117ca4a2a0d6cc63eddf26744
 -F src/delete.c 0750b1eb4d96cd3fb2c798599a3a7c85e92f1417
 +F src/delete.c 20a360262b62051afacb44122b3593a8bd9be131
- 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
@@@ -212,7 -195,7 +212,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
- F src/main.c e8d76c9dc47ae7aac2bb1b3d65b55cea4fdc900f
 -F src/main.c 84cc0fc4861bd2b06c286b38bf03bce604a0a66a
++F src/main.c 962eac230ec5c619ebccafa498bcfb617af0cc79
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@@ -243,19 -226,19 +243,19 @@@ F src/pragma.c d54cdd40b63d608f2d95b748
  F src/prepare.c b7b7bf020bd4c962f7c8aed5a3c542c7dfe9f9c7
  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 428165951748151e87a15295b7357221433e311b
+ F src/select.c f377fb8a5c73c10678ea74f3400f7913943e3d75
 -F src/shell.c 45d9c9bd7cde07845af957f2d849933b990773cf
 -F src/sqlite.h.in 6ec654324cb490ea3d8a7be28b8c7d37fe4ad282
 +F src/shell.c 81e4f2b57396db0714bc73d1f95cf3970f5dcc10
- F src/sqlite.h.in 76626596dabd96d98b3bb88495386b1bb5fa7f44
++F src/sqlite.h.in 9e505658e72a84604b7571b6bc78d8a9bde0a9b7
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 4ad823ef8e31448ca333eafa1892ab35759ae6c1
 -F src/sqliteInt.h 28049b803b74a7f73242a8226915ea00ebb1309f
++F src/sqliteInt.h aff67183ad2b5d29f71a3084e15d16cae96f622c
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
 -F src/tclsqlite.c 0a874655dd39a9875e39c5d3c464db662171d228
 +F src/tclsqlite.c 05be57620509060e85064b9495256c05d56e76b0
- F src/test1.c a0bce4f47da65b76c80e5f8bf9a5ef174603866a
+ F src/test1.c f5d7ecd3dd663b11f35269fd91f7090db0570903
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -308,13 -291,13 +308,13 @@@ F src/update.c d207deb7a031f698104bee87
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
  F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
- F src/vdbe.c 24e590213c0b5b4432db922fcc2981d918b6607d
 -F src/vdbe.c 1a9e671c9cfc259e4d2affc71f7df4a4c00a842c
 -F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
 -F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
 -F src/vdbeapi.c 07acb615d1e4170e71fc1b0d087f3c53a1ad8e83
 -F src/vdbeaux.c 6f7f39c3fcf0f5923758df8561bb5d843908a553
 -F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
 -F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
++F src/vdbe.c c02217423a807dc97c743f5fff493cd55dffa77d
 +F src/vdbe.h b434bb75fbec973d18d49225a59833ae39ee2afc
 +F src/vdbeInt.h dc69f0351bef56456fdba3e09d3387ba4f1b1520
 +F src/vdbeapi.c 3d4d2a2b24055ce2cb029fa73067c56616264b51
 +F src/vdbeaux.c ccf6b7ca6c7361bdb71d12385b4cff70b395486c
 +F src/vdbeblob.c cb7359c2d99df92c35cdaedc12af6d4f83854cb7
 +F src/vdbemem.c 96e41193b4affd9ebc0eea2fa628879dac88c744
  F src/vdbesort.c 42c166f7ca78cb643c7f4e4bdfa83c59d363d1a6
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
@@@ -1241,7 -1223,7 +1241,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 f09055f3c4348264c7336f90646375f0d98b061e 61b31e771430f490fc2c4cef55046debc4a5f4f5
- R 4cb97995ea5a95cf1669fe4c63af9fe5
 -P 1461d543ac8a3e4a54405067893146c74576bb4e
 -R fc5b0159564faa200a156d134ab758df
++P 2617d93713d9f4cf907ab2e7baef6a0f74f7198e 0d3aef97ebddf422b8bdcbc5878970c6129e3f54
++R 6c3870353869dc63de6b6e7262754990
  U drh
- Z 1bc55c89abd689844735dcd7c551f20d
 -Z 018f1b0eb45096a13f52fc7d70ef2bc6
++Z 0421768e128ea5c34e2d7a186ce23ac0

diff --cc manifest.uuid
index af77bccc437e3dc3e6b037b2df9b6bb757319472,7416b1cda363c841763bdd9293d3ba4eca143ef2..b765ac2f7de2f292ecb4e9ec9582b39d734c12e8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2617d93713d9f4cf907ab2e7baef6a0f74f7198e
 -0d3aef97ebddf422b8bdcbc5878970c6129e3f54
++34ffa3b3c002b0e87d8382ad76e87dbaec0b2bc6

diff --cc src/main.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