Merge all recent enhancements and bug fixes from trunk into the apple-osx

branch.

FossilOrigin-Name: 43c4ba26a20ca0230d898a6431ed9ae5cfdb63d3

diff --cc manifest
index 6dab2c4295ab6266ccaa41b11e8dd3405c0d862c,7f9f9524d0278cd10138b573a0f5b1cc24975714..7f0b08dfca4ca5dcb7dc0a7154076d58b1b651b3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\srecent\strunk\senhancements.
- D 2014-11-18T21:27:48.468
 -C Convert\stwo\sunreachable\sbranches\sinto\sassert()\sstatements.
 -D 2014-12-02T16:16:47.791
++C Merge\sall\srecent\senhancements\sand\sbug\sfixes\sfrom\strunk\sinto\sthe\sapple-osx\nbranch.
++D 2014-12-02T16:38:43.733
  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
@@@ -176,7 -173,7 +176,7 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 7ddee9c7d505e07e959a575b18498f17c71e53ea
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c 6d877cd224c8a600b34519b219980184e83e0a03
 -F src/btree.c 44b58cd798a32579816ce274e415de262df9843d
++F src/btree.c da9a40fdf900e9384df3957500a48418324bef91
  F src/btree.h e31a3a3ebdedb1caf9bda3ad5dbab3db9b780f6e
  F src/btreeInt.h 3363e18fd76f69a27a870b25221b2345b3fd4d21
  F src/build.c 67bb05b1077e0cdaccb2e36bfcbe7a5df9ed31e8
@@@ -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 a3ff05db5709d628c23890db862e30f3dd9dc428
+ F src/expr.c 73de4c0da2eed6b149d40a05c589dfeb2c4a87a1
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
- F src/func.c 93a4b3c54019d6dbbe49800822d802df70553980
 -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 e260eb4acd192a3958b5d529507e447cab031cbc
 -F src/main.c 54d0f4896cebc61ae5f831937464953780fe5346
++F src/main.c b847849c44bf2abf91efdda78f21fb31b22fd802
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@@ -216,11 -213,11 +216,11 @@@ 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 b7c7af7c5b6ee6f36d7fca825346a317c1ea0a55
 -F src/pager.c b8764f90c135482988268eec93d7f5cdb89d687a
 -F src/pager.h d1eee3c3f741be247ce6d82752a178515fc8578b
++F src/pager.c 7663d83bdf3776f3cc91fcefbd4722d4f4af66ac
 +F src/pager.h 78ba46ce1f98b9a9791f4b39e52aedd6ed988472
  F src/parse.y 5dfead8aed90cb0c7c1115898ee2266804daff45
  F src/pcache.c ace1b67632deeaa84859b4c16c27711dfb7db3d4
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
@@@ -231,18 -228,17 +231,18 @@@ F src/printf.c 9e75a6a0b55bf61cfff7d7e1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 4965007d6497b6a4d7a6d98751cc39712885f952
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 -F src/select.c 428165951748151e87a15295b7357221433e311b
 +F src/select.c 00edeea62174d9fc5e010e0044f2af64233cf602
- F src/shell.c bc28d5992109717c87804e2eb1a08a7c8cc7a2fd
- F src/sqlite.h.in 0abc2ddd9601e530b471847c73a4379ab50854b6
+ F src/shell.c 45d9c9bd7cde07845af957f2d849933b990773cf
 -F src/sqlite.h.in c63db0117aeb749ca02b6016dbbbccbbbd9a141d
++F src/sqlite.h.in 8e134856471d5f3ed9fd23121369ac6a93b2f042
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h f9240915e0ccd579f6cab7b23d419f181665f687
 -F src/sqliteInt.h c9e95b8fa9aee30d46387735c5be73fa58886e38
++F src/sqliteInt.h 67297342e0cbac5af4d5bc94c5b8460757a11213
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
  F src/tclsqlite.c 0a874655dd39a9875e39c5d3c464db662171d228
- F src/test1.c d9d4d9174e9e320e079e437ddbfd1c7e6cb9e8c0
 -F src/test1.c a0bce4f47da65b76c80e5f8bf9a5ef174603866a
++F src/test1.c 169a6be750c4c56896ff1b111f1e68a09795d2c3
  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 cb6dab39d71464050c186efead93a68fcacd82b0
 -F src/vdbe.c ec1f55acef4864520ca2017b9f0d60c2ac1b8b78
++F src/vdbe.c 8a4609393b10b07ca2783409cb7915ed4bac154a
  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 7354ce66d5e919d2d54c9fa42aeda64711487a44
++F src/vdbeaux.c 6f91a25abf07dbbda79c155e5ae8860816dcef13
  F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
  F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
- F src/vdbesort.c 87f3923483113d1c95d84640becb4e4946f27d9a
+ F src/vdbesort.c 42c166f7ca78cb643c7f4e4bdfa83c59d363d1a6
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
- F src/vtab.c 2a30791bbd7926b589401bd09c3abb33de563793
- F src/wal.c bb8e3f9adf475ef8a644d1b678d4d0114321b19d
+ F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
 -F src/wal.c 486e644b3b8aa5ad066f625bc428aa8ff7001405
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
++F src/wal.c d7c4c36a21d41c8470f78f58a6ccd5f766067ed6
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  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/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -370,7 -366,8 +370,8 @@@ F test/between.test 34d375fb5ce1ae283ff
  F test/bigfile.test aa74f4e5db51c8e54a1d9de9fa65d01d1eb20b59
  F test/bigfile2.test 1b489a3a39ae90c7f027b79110d6b4e1dbc71bfc
  F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747
 -F test/bind.test 3c7b320969000c441a70952b0b15938fbb66237c
+ F test/bigsort.test 835478d0ce83bd1e5b05c90571dedd9871a09196
 +F test/bind.test 30af0fc61bc3836034215cdbdeca46113ca1b4a1
  F test/bindxfer.test efecd12c580c14df5f4ad3b3e83c667744a4f7e0
  F test/bitvec.test 75894a880520164d73b1305c1c3f96882615e142
  F test/blob.test e7ac6c7d3a985cc4678c64f325292529a69ae252
@@@ -382,9 -379,10 +383,10 @@@ F test/boundary3.tcl 23361e108a125dca9c
  F test/boundary3.test 56ef82096b4329aca2be74fa1e2b0f762ea0eb45
  F test/boundary4.tcl 0bb4b1a94f4fc5ae59b79b9a2b7a140c405e2983
  F test/boundary4.test 89e02fa66397b8a325d5eb102b5806f961f8ec4b
+ F test/btree01.test e08b3613540145b353f20c81cb18ead54ff12e0f
  F test/btreefault.test c2bcb542685eea44621275cfedbd8a13f65201e3
  F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0
 -F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de
 +F test/cache.test 0bc2195f4a7207108af2617ed356e77daf4412f7
  F test/capi2.test 011c16da245fdc0106a2785035de6b242c05e738
  F test/capi3.test f0718f4f90d0efdc980119bfbdf1d7f1541ee5ef
  F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
@@@ -778,11 -775,11 +780,11 @@@ F test/pagerfault2.test caf4c7facb914fd
  F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
  F test/pageropt.test 6b8f6a123a5572c195ad4ae40f2987007923bbd6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
 -F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
 +F test/pcache.test 488061b5dd685df2234d690370285c9b4813377b
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
- F test/permutations.test cef25f5e8499a15846eccd06785f17f4180407ab
- F test/pragma.test 5e4805a9535d46d5be677075c9663941fc40615a
+ F test/permutations.test 4e12d43f4639ea8a0e366d9c64e0009afe2eb544
 -F test/pragma.test 49ac8a73c0daa574824538fed28727d1259fe735
++F test/pragma.test 1666a0a9fb910b7f45d0c3f413d54c1d997be3cc
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/printf2.test b4acd4bf8734243257f01ddefa17c4fb090acc8a
@@@ -858,9 -855,9 +860,9 @@@ F test/shell4.test 8a9c08976291e6c6c808
  F test/shell5.test 15a419cc1df21c892ed64f5596ae7a501f2816f2
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
 -F test/shrink.test 8c70f62b6e8eb4d54533de6d65bd06b1b9a17868
 +F test/shrink.test 41ab166b276af4812bcaf6f1b99c53fab4e706d0
  F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
- F test/skipscan1.test 7e15e1cc524524e7b2c4595ec85c75501d22f4ff
+ F test/skipscan1.test 2ddfe5d168462170c4487f534e2a99fb006b2076
  F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a
  F test/skipscan3.test ec5bab3f81c7038b43450e7b3062e04a198bdbb5
  F test/skipscan5.test 67817a4b6857c47e0e33ba3e506da6f23ef68de2
@@@ -1226,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 fef8430f1284b08b1c2af3d5639037478c58fb7e 296b0c7397790ceadbdb330959e962f6491abc3e
- R 2408dd0cf483fbae1ba2b14cf3257c3f
 -P 0d04f380e1bd17104b3cf76b64d0cfc79a726606
 -R 22214da224af1bd07c2ba4ce527797c4
++P ccb601f6dffba68a57d82db2d046aa27f6f1b755 61b31e771430f490fc2c4cef55046debc4a5f4f5
++R 3494967f4777b590bf91695bcd03afdd
  U drh
- Z a0174c63e338cb811c512af66228b273
 -Z 4469ca4ec037115204af98a9b9e41068
++Z 6c52a71410820e5dbd946b25806390e2

diff --cc manifest.uuid
index 37ada271b928b8ed8e537a5aa2aee25ef914dbcf,fe8f0fdad5cfd0e23f80539da43f1c70c28aed9e..8a2b50f3d4cc3c8fe1754fdd37f4fae912cc8da3
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ccb601f6dffba68a57d82db2d046aa27f6f1b755
 -61b31e771430f490fc2c4cef55046debc4a5f4f5
++43c4ba26a20ca0230d898a6431ed9ae5cfdb63d3

diff --cc src/btree.c
Simple merge

diff --cc src/func.c
Simple merge

diff --cc src/main.c
Simple merge

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

diff --cc src/wal.c
Simple merge

diff --cc test/pragma.test
Simple merge