Merge the latest enhancements from trunk.

FossilOrigin-Name: 2c9e5436bd9146f0d76eb58e75cb76109d074ff7

diff --cc manifest
index eb743a9a73fccfc9f83984e39bfb3de5658b4f1a,d831f3f7cd780cd78ba84cd25f24072d2d1b351b..7b6a76458e6b12be4d51cea411202a32e6613599
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\sfixes\sfrom\strunk.
- D 2015-11-13T02:13:18.484
 -C Fix\sproblems\swith\sthe\sway\sthe\sIsHiddenColumn()\smacro\sis\sdefined.
 -D 2015-11-19T18:11:20.451
 -F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
++C Merge\sthe\slatest\senhancements\sfrom\strunk.
++D 2015-11-19T19:48:24.878
 +F Makefile.in eebca73951f1f5827925d997e634daef95fdd364
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc e928e68168df69b353300ac87c10105206653a03
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -285,10 -282,10 +285,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 2869a76c03eb393ee795416e2387005553df72bc
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
 -F src/btree.c d3bdd8462a86492e2ebc9aca4a0168429017de25
 +F src/btree.c 59c8f28530850c9f94be62aa4c020d39a4de10d2
  F src/btree.h 2d76dee44704c47eed323356a758662724b674a0
  F src/btreeInt.h 3ab435ed27adea54d040584b0bcc488ee7db1e38
- F src/build.c ca574d33ffb1763cfd2979383f4d507095bfbe19
+ F src/build.c 5a3b71786e2b96d2bb92d40f190eb1fe736f25ca
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 509ef9c64d1321f42448f111da86400b1799218a
@@@ -303,11 -300,11 +303,11 @@@ F src/global.c 508e4087f7b41d688e4762dc
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 419a947f27ce2da18eebf440a5aa80cc825defae
+ F src/insert.c e1d20ae8979e25519c2670233718676bedcfedc9
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
  F src/loadext.c 18586e45a215325f15096821e9c082035d4fb810
 -F src/main.c 91feb5c7e393ad8f0c434754114a3493c3b0617a
 +F src/main.c 5d8883e245ff3c7a24529e964d807a942a8fd16a
  F src/malloc.c 337bbe9c7d436ef9b7d06b5dd10bbfc8f3025972
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -326,34 -323,33 +326,34 @@@ 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 93f3106e2a4f16d9c50fe4decaeddba8ad3d9fb4
- F src/os_win.c 1666013b5b107c70f703abece20e0e2f2137d6bd
 -F src/os_unix.c eb24e0340fbe3cfd0eabfb15a71476953e54fa73
 -F src/os_win.c 2d77dab5c555a18c0aff379c6a692fc3499044d9
++F src/os_unix.c f3e7ee04047592105e6408fde79a218cdf85bbe9
++F src/os_win.c 210580a96369786f43f3ccb47096f7b9b86fe980
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 18341e2b759b447cbc82fb9215d08d9c5864e92e
 -F src/pager.h 87c4118a71ba3965184148b379a6d93179071091
 +F src/pager.c 93b495fb0503425bb909a01ff4f5794dbfab819c
 +F src/pager.h 22bbab15f41ac42ce0b51e39a7d02eb5eb2833c2
- F src/parse.y aad5cc866dc23719f361fe7e0b8eaec8ce4861a4
+ F src/parse.y 23737e649c26ce327603799e57f5c2ff50e5e6ba
  F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23
  F src/pcache.h 1ff11adce609ba7de139b6abfabaf9a2bac947b5
  F src/pcache1.c 902e1bc7bdaa81b40f8543407c5e2ac8ef4dc035
 -F src/pragma.c f3e7147299ca05ef4304a36f1fd6e002729c72c6
 +F src/pragma.c c1ab37e1576d22715d3bae4f51658326240a8161
  F src/pragma.h 3d94aebbebd2089899fecc01909bf2608b39507d
 -F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
 +F src/prepare.c 176b060bcf36041193c2807f2b045dce1effa4bb
- F src/printf.c 0c4bcdd1c2e2521024f0a69cb5eb334f86b3652a
+ F src/printf.c f8fc8f04e75b1e983ef2793c27ec7a43b287e94a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 00a2a10d4298a685d0eeb05b09ef018a2bd81bf8
- F src/shell.c acefb4593a9bf0338a757c968f1f1bb05690d830
+ F src/select.c 2376d320907a5c28c55290f18fd94aa3400bf97c
+ F src/shell.c f0f59ea60ad297f671b7ae0fb957a736ad17c92c
 -F src/sqlite.h.in fa62718f73553f06b2f2e362fd09ccb4e1cbb626
 +F src/sqlite.h.in df28d4fdd2c6c902ed68bb4d0223e370f97c7d74
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
- F src/sqliteInt.h 649e4e7d7a618d91c91ade829fa9086604f4683d
 -F src/sqliteInt.h 25d0792e6d355a27975dc7c49c4514b3f6eb2294
++F src/sqliteInt.h ed4a27c98da2caaa6db8b0a8f57c05085586de9b
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
  F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
- F src/test1.c ef7958e80883c7e6a61465cb8ea3945c180d66e8
 -F src/test1.c 4004bcc1b3b361a9137acd1d875599ecbdd6f961
++F src/test1.c 5abe6505544d173c8daf020c276e4a7670683cc1
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -367,7 -363,7 +367,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 8e17d2d3e24130658e7371a8114e7aa41a394088
 -F src/test_config.c f2824de39f59d8d621e2d6ec5cc67006d000b2eb
++F src/test_config.c ca2fdaf49a314ee38cc7363d90ed9cb0905f4155
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -935,8 -931,8 +936,8 @@@ F test/pcache.test 9a04fa260cb47dd4fdc5
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test 4ea119731c62d2f7d0aa86dd5b184cbb61ca411b
 -F test/pragma.test a44253f911e7d50127d4a08f927f47c861a4c772
 +F test/pragma.test fc0c3c0ca53ad82b32c02db7000c1c6ba4449fce
- F test/pragma2.test 1a4cc20b0cd8fc6411bd2f828cdc3ea1bdd570b9
+ F test/pragma2.test 00065068eeab2d15ea55465ec0f1e0a70e2c369e
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
@@@ -1408,7 -1404,7 +1409,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 178da33909ff8e524cdefeede40fa5bd908efb37 367ec0db49607559960d58891771113c205fd951
- R 69354fa6b1fb4f06cbfa41c37eca9b34
 -P 13995756ad8b80568aa2f74387788a8cab1123ef
 -R 7d5fbb49b212de9edfd34eb075dc8992
++P f9060b2a9860b09ea0e268f6c135a2c78bc8d12d 126b998cf163dcdd5a222634f1e929f04db3c700
++R df6d884037dca343cf419efa4c114cdb
  U drh
- Z f6978513e5067fdbee9e868f875096ce
 -Z bc25bafe8827ab2ba48c52405ca8c198
++Z 5ea58909e6378f1c3d3e2b46f59923ff

diff --cc manifest.uuid
index 20ed36ecb7d5e3e25f9bf43c332b4c521b02a5ed,3e5e242be018e490c76c6031ca86513c4df878bb..9f5e0df45a46e44f7745c93690c985b26de40292
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f9060b2a9860b09ea0e268f6c135a2c78bc8d12d
 -126b998cf163dcdd5a222634f1e929f04db3c700
++2c9e5436bd9146f0d76eb58e75cb76109d074ff7

diff --cc src/os_unix.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/test_config.c
Simple merge