Merge all recent fixes and enhancements from trunk into sessions.

FossilOrigin-Name: 2617d93713d9f4cf907ab2e7baef6a0f74f7198e

diff --cc manifest
index 3bf03658d63ffba6280660e349473c72ae44e030,7f9f9524d0278cd10138b573a0f5b1cc24975714..f563572da142e559ee04b2abab623040ee12eb8f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\srecent\strunk\senhancements,\sincluding\sthe\sread-after-ROLLBACK\schange\nand\sthe\saddition\sof\ssqlite3_stmt_scanstatus()\ssupport,\sas\swell\sas\svarious\nminor\sbug\sfixes.
- D 2014-11-18T21:20:57.012
 -C Convert\stwo\sunreachable\sbranches\sinto\sassert()\sstatements.
 -D 2014-12-02T16:16:47.791
++C Merge\sall\srecent\sfixes\sand\senhancements\sfrom\strunk\sinto\ssessions.
++D 2014-12-02T16:31:01.447
  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,11 -181,11 +198,11 @@@ 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 a3ff05db5709d628c23890db862e30f3dd9dc428
+ F src/expr.c 73de4c0da2eed6b149d40a05c589dfeb2c4a87a1
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
- F src/func.c ba47c1671ab3cfdafa6e9d6ee490939ea578adee
+ F src/func.c 6d3c4ebd72aa7923ce9b110a7dc15f9b8c548430
  F src/global.c 6ded36dda9466fc1c9a3c5492ded81d79bf3977d
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
@@@ -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 46e2f592797c6167fb6964a7fa953c480ec766d8
 -F src/main.c 54d0f4896cebc61ae5f831937464953780fe5346
++F src/main.c e8d76c9dc47ae7aac2bb1b3d65b55cea4fdc900f
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@@ -246,16 -229,16 +246,16 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c 4965007d6497b6a4d7a6d98751cc39712885f952
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c 428165951748151e87a15295b7357221433e311b
- F src/shell.c a67b1304a7d93f26ec611de7b4650307f8e074a7
- F src/sqlite.h.in 6a51d3ab98e02777b894f361a81766eb9cee7413
 -F src/shell.c 45d9c9bd7cde07845af957f2d849933b990773cf
 -F src/sqlite.h.in c63db0117aeb749ca02b6016dbbbccbbbd9a141d
++F src/shell.c 81e4f2b57396db0714bc73d1f95cf3970f5dcc10
++F src/sqlite.h.in 76626596dabd96d98b3bb88495386b1bb5fa7f44
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 29e71a7464bdec315a269976b817b7add6d4edbc
 -F src/sqliteInt.h c9e95b8fa9aee30d46387735c5be73fa58886e38
++F src/sqliteInt.h 4ad823ef8e31448ca333eafa1892ab35759ae6c1
  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 6b0469b8e06c77b1de1d3e4a3834cf26edea9cc7
+ F src/test1.c a0bce4f47da65b76c80e5f8bf9a5ef174603866a
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -308,20 -291,20 +308,20 @@@ F src/update.c d207deb7a031f698104bee87
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
  F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
- F src/vdbe.c ef0d4a46d2aa7f6aedb2c4c29c66e1e33d4c7168
 -F src/vdbe.c ec1f55acef4864520ca2017b9f0d60c2ac1b8b78
 -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 24e590213c0b5b4432db922fcc2981d918b6607d
 +F src/vdbe.h b434bb75fbec973d18d49225a59833ae39ee2afc
 +F src/vdbeInt.h dc69f0351bef56456fdba3e09d3387ba4f1b1520
 +F src/vdbeapi.c 3d4d2a2b24055ce2cb029fa73067c56616264b51
- F src/vdbeaux.c 19ecf5fc0524346e46c31fa035c57adb90ffa49e
++F src/vdbeaux.c ccf6b7ca6c7361bdb71d12385b4cff70b395486c
 +F src/vdbeblob.c cb7359c2d99df92c35cdaedc12af6d4f83854cb7
 +F src/vdbemem.c 96e41193b4affd9ebc0eea2fa628879dac88c744
- F src/vdbesort.c 87f3923483113d1c95d84640becb4e4946f27d9a
+ F src/vdbesort.c 42c166f7ca78cb643c7f4e4bdfa83c59d363d1a6
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
- F src/vtab.c 2a30791bbd7926b589401bd09c3abb33de563793
- F src/wal.c fa090966140602f03a621f87d82ee69e66ca63b5
+ F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
+ F src/wal.c 486e644b3b8aa5ad066f625bc428aa8ff7001405
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c 3862a1173ae2716bde12f1ab3fb649f1d85b05c2
+ F src/where.c a0b16f9d78321cb340a977287d19f826555c7d3b
  F src/whereInt.h d3633e9b592103241b74b0ec76185f3e5b8b62e0
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -793,8 -778,8 +795,8 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
- F test/permutations.test a33230010a3d4ce0c57d586672ccef10a7d1af29
- F test/pragma.test 19d0241a007bcdd77fc2606ec60fc60357e7fc8b
 -F test/permutations.test 4e12d43f4639ea8a0e366d9c64e0009afe2eb544
++F test/permutations.test 5e60eb6ca8429453ab20525dc6ac93d9c41dac6e
+ F test/pragma.test 49ac8a73c0daa574824538fed28727d1259fe735
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/printf2.test b4acd4bf8734243257f01ddefa17c4fb090acc8a
@@@ -1239,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 28b044a51215a3f64dafb2cf3b6cb7d2029580ef 296b0c7397790ceadbdb330959e962f6491abc3e
- R 29b28d376c9121783d6d4ac3519f50ed
 -P 0d04f380e1bd17104b3cf76b64d0cfc79a726606
 -R 22214da224af1bd07c2ba4ce527797c4
++P f09055f3c4348264c7336f90646375f0d98b061e 61b31e771430f490fc2c4cef55046debc4a5f4f5
++R 4cb97995ea5a95cf1669fe4c63af9fe5
  U drh
- Z c3d0de9dd44c494f12cc744c4f6471c6
 -Z 4469ca4ec037115204af98a9b9e41068
++Z 1bc55c89abd689844735dcd7c551f20d

diff --cc manifest.uuid
index 5f7a3cf0d4d507e658ecfd9d1be7b67a560e0951,fe8f0fdad5cfd0e23f80539da43f1c70c28aed9e..af77bccc437e3dc3e6b037b2df9b6bb757319472
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f09055f3c4348264c7336f90646375f0d98b061e
 -61b31e771430f490fc2c4cef55046debc4a5f4f5
++2617d93713d9f4cf907ab2e7baef6a0f74f7198e

diff --cc src/main.c
Simple merge

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

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/permutations.test
Simple merge