Merge updates from trunk.

FossilOrigin-Name: 00990020d07d7c87b922cdbfa5373298a86bb4b3

diff --cc manifest
index 257bc1271979390f23dab283a73feb60e27738f6,9328401ca9f1d68e2933d807185981b3f81445fc..2ba8a3c8f7a441ca9cd8ab6fa602998335001619
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,19 -1,20 +1,20 @@@
- C Cleanup\slocaltime()\ssupport\sfor\sWindows\sCE.
- D 2016-01-23T01:54:15.466
- F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 -C Incorrect\sversion\sof\sbuild.c\schecked\sin\sat\s[87e5f5a6c60e3]\s(because\sI\nneglected\sto\spress\sthe\s"Save"\sbutton\son\sthe\stext\seditor).\s\sThere\sis\sno\schange\nto\sthe\slogic,\sjust\simproved\spresentation.
 -D 2016-04-05T15:59:23.006
++C Merge\supdates\sfrom\strunk.
++D 2016-04-05T17:59:56.435
+ F Makefile.in e812bb732d7af01baa09f1278bd4f4a2e3a09449
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 1708a78eda223b6daa302b140037fcc214a779f9
+ F Makefile.msc fe57d7e3e74fa383fd01ced796c0ffd966fc094a
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
+ F VERSION 5d234da9b5dae329fab75ff75884cfe0a9cb3fda
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
  F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
  F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
- F autoconf/Makefile.am 089e5ecdb5761e64ea1013ded02feb4d8b29927d
- F autoconf/README 14458f1046c118efa721aadec5f227e876d3cd38
+ F autoconf/Makefile.am 42f7eb1fb2b06ddd6c6adab3e4388cc0a237ba40
+ F autoconf/Makefile.msc dc0d0500e4a827cb3891d08d846dd6dd40241b51
  F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
- F autoconf/configure.ac 7b1ea0dcaf49fafba262ce4b0ee8cb3281b555d1
 -F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1
++F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1 w autoconf/README
+ F autoconf/configure.ac d807b567f73a2b0986ccdd206b782cecb4d08fff
  F autoconf/tea/Makefile.in b438a7020446c8a8156e8d97c8914a04833da6fd
  F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873
  F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
@@@ -281,28 -312,28 +312,28 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 9d649e46c780166e416fb11dbd23f8d49aab8267
- F src/analyze.c 0043d3e501f04297fed2bb50b488bc08d5c39f36
- F src/attach.c 07b3a34a1702dce92a7f1d3888c0c06222b63760
+ F src/alter.c 1bb0709b3048e24217b80ec6bd78a3e99a47c01b
+ F src/analyze.c 37fedc80ac966ce1745811746e68e4d8fa64c7fe
+ F src/attach.c 771153bd1f4ab0b97a44a13dde2c7e5e1efeba22
  F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
- F src/backup.c 2869a76c03eb393ee795416e2387005553df72bc
- F src/bitvec.c 1a78d450a17c5016710eec900bedfc5729bf9bdf
+ F src/backup.c f60f0aa55d25d853ffde53d0b0370a7bb7ee41ce
+ F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c f224ae877fde69d1a9d430f502edaf8502752dbe
- F src/btree.h 526137361963e746949ab966a910c7f455ac6b04
+ F src/btree.c 556203aab543e91f4e20cc273a507ed712c8da26
+ F src/btree.h a5008b9afe56e8e54ade6c436a910f112defcca9
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c b4eba1e84752ec9cae7ff3dacd5a8b6d1ab8deb9
- F src/callback.c 29ae4faba226c7ebb9aee93016b5ce8a8f071261
- F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
+ F src/build.c c5cf206191880f88142352629d53fed174fc10bd
+ F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
+ F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
- F src/date.c 6142d9e4d25fa5ec78f44644c411ee64b5bfbdd0
- F src/dbstat.c b2ec6793eef97aebb4d171d490a4ffdfa9f2475c
- F src/delete.c 00af9f08a15ddc5cba5962d3d3e5bf2d67b2e7da
- F src/expr.c d10c1cdef5810cdbf73adc9f9b383684230b360a
 -F src/date.c 0b73e681c11fca867fec554750c07fe0d4e417c1
++F src/date.c cd412cb2adb0c3a60e085107864931e508f45ad8
+ F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b
+ F src/delete.c eeac28b3d3d88e3541bdf93e91ea7492a7b67842
+ F src/expr.c 289ffac5240b60fee0a824d3d5ab2d7bd2630c94
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c c66d3e5b35d4d95b5c1e2ee6c12f5df13a7f9ad6
- F src/func.c ba6c03f9e440f5693086c08ee88e6e60212b3504
- F src/global.c bd5a0af3f30b0c01be6db756c626cd3c33a3d260
+ F src/fkey.c 4c0bd09e602b8ae8d36d81e31e4872d0b53c87bb
+ F src/func.c 552d300265aed09eea21f68ac742a440550c0062
+ F src/global.c 884d4c7eba9f5fc25c96a23b21520da19b7713e2
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
@@@ -325,37 -355,37 +355,37 @@@ F src/mutex_noop.c 9d4309c075ba9cc7249e
  F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
  F src/mutex_w32.c 5e6fe1c298fb5a8a15aaed4161d5759311431c17
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
- F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
- F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
- F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
+ F src/os.c ca10edb445ad2c5fdc7285b49d72bcdf261fa23e
+ F src/os.h 91ff889115ecd01f436d3611f7f5ea4dc12d92f1
+ F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 0eb7f469fcd4e1fbedf30060438e26b839ec5486
- F src/os_win.c 3cd1dbb6800a1996f25c027850e512d0631d4cf6
+ F src/os_unix.c b1ccb273771f41dbdbe0ba7c1ad63c38ad5972ec
 -F src/os_win.c b3ba9573d8d893e70a6a8015bbee572ecf7ffbef
++F src/os_win.c be21cb97d7c679a27851d85c26ddc3a80ffb2ec5
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c f4e9ac39fbb1e0fde97af85c0f4e00eb90764b67
- F src/pager.h 1c2a49143dfba9e69cc8159ef019f472ed8d260b
- F src/parse.y caad1e98edeca6960493d0c60d31b76820dd7776
- F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23
+ F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d
+ F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
+ F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
+ F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
- F src/pcache1.c 72f644dc9e1468c72922eff5904048427b817051
- F src/pragma.c ea290193369faa0a26ae2f924e7b86289b4a7987
+ F src/pcache1.c c40cdb93586e21b5dd826b5e671240bd91c26b05
+ F src/pragma.c faf42922bb7ab2f6672cb550356c1967abae3c84
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
- F src/prepare.c 74855ddbdfad6a1c4a4d5c4b0913ebb01174ba19
- F src/printf.c af589a27b7d40f6f4f704e9eea99f02f18ad6d32
+ F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
+ F src/printf.c 63e6fb12bbe702dd664dc3703776c090383a5a26
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 9f7ce3a3c087afb7597b7c916c99126ff3f12f0c
- F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 1db9a902e89201a0ae3ff5243a7a3f37842a3937
- F src/shell.c dcd7a83645ef2a58ee9c6d0ea4714d877d7835c4
- F src/sqlite.h.in 214476a62012e578f42133a9a3b4f97a9aa421a3
+ F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
+ F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
+ F src/select.c 7849cee0a01952a9c93cd28989daedfa57731143
+ F src/shell.c b7922fa264f8c8d72a5ec6dd0b091e15a93c4de5
+ F src/sqlite.h.in 7f437b068314f053e6417d452c59f08d05092591
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h ba1dd2b253f256353493c674425b54e0cd1e2409
- F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
+ F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
 -F src/sqliteInt.h 594bf31a7a0cc788688ca947e562576e23bd7904
++F src/sqliteInt.h 8da202a3a7874497db07fae72c1f94ca6522a6c3
+ F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
- F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
- F src/tclsqlite.c 94ef6e2794220c5b6064d4c78ec7169a8c5cc45d
- F src/test1.c 4f1b42699068b7806af3111786f5ad760c2c1ff7
+ F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
+ F src/tclsqlite.c 56569acc73d36e836b64aefecbbb709a92ba0077
+ F src/test1.c 7187b7e924bfc97780e6fd2a40dad94a32bddca0
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -976,6 -1012,7 +1012,7 @@@ F test/savepoint4.test c8f8159ade6d2acd
  F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
  F test/savepoint6.test f41279c5e137139fa5c21485773332c7adb98cd7
  F test/savepoint7.test db3db281486c925095f305aad09fe806e5188ff3
 -F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2
++F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2 w test/savepoint3.test
  F test/scanstatus.test 5253c219e331318a437f436268e0e82345700285
  F test/schema.test 8f7999be894260f151adf15c2c7540f1c6d6a481
  F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5
@@@ -1337,9 -1375,10 +1375,10 @@@ F test/whereE.test b3a055eef928c992b0a3
  F test/whereF.test 5b2ba0dbe8074aa13e416b37c753991f0a2492d7
  F test/whereG.test dde4c52a97385a55be6a7cd46be8373f0cf35501
  F test/whereH.test e4b07f7a3c2f5d31195cd33710054c78667573b2
- F test/whereI.test 1d89199697919d4930be05a71e7fe620f114e622
+ F test/whereI.test eab5b226bbc344ac70d7dc09b963a064860ae6d7
  F test/whereJ.test 55a3221706a7ab706293f17cc8f96da563bf0767
  F test/whereK.test f8e3cf26a8513ecc7f514f54df9f0572c046c42b
 -F test/wherefault.test 1374c3aa198388925246475f84ad4cd5f9528864
++F test/wherefault.test 1374c3aa198388925246475f84ad4cd5f9528864 w test/where8m.test
  F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
  F test/wild001.test bca33f499866f04c24510d74baf1e578d4e44b1c
  F test/win32heap.test ea19770974795cff26e11575e12d422dbd16893c
@@@ -1417,12 -1459,30 +1459,30 @@@ F tool/varint.c 5d94cb5003db9dbbcbcc5df
  F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
  F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
- F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
+ F tool/warnings.sh a98af506df552f3b3c0d904f94e4cdc4e1a6d598
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P a79c46bc61a35edbaf6112c26e8052314b0eb16a
- R 84f9a6399ea3db7dae9e4103397ece9e
- T *branch * winCeLocalTime
- T *sym-winCeLocalTime *
- T -sym-trunk *
+ F vsixtest/App.xaml b76d3b48860e7454775c47ea38ffea9c4abe3e85
+ F vsixtest/App.xaml.cpp c465147f50871165c60ca16955219f6c5812d6d8
+ F vsixtest/App.xaml.h 4a9768e2983d05600ad1e1c2f1b00a132967da9f
+ F vsixtest/Assets/LockScreenLogo.scale-200.png e820c9a3deb909197081b0bf3216c06e13905f0a
+ F vsixtest/Assets/SplashScreen.scale-200.png cab70988ca71bebec7bfeb3b6dbafe17b9ab0b4a
+ F vsixtest/Assets/Square150x150Logo.scale-200.png e17b40817db7a239fc239d83efcc951fb824e3ff
+ F vsixtest/Assets/Square44x44Logo.scale-200.png 2f166237094dea94d952d10b9eeae81806844f1c
+ F vsixtest/Assets/Square44x44Logo.targetsize-24_altform-unplated.png 5f6a6d391b95a3061ccca6e6fdd6955ede63b4ed
+ F vsixtest/Assets/StoreLogo.png 0828b7257db74a4ecd5eeb6b7b4971f0fdc4d9d1
+ F vsixtest/Assets/Wide310x150Logo.scale-200.png 04ddefe5bc5f43ae12a7433f6f236ddab101ac42
+ F vsixtest/MainPage.xaml 34f49897e3ca533a7e74506ba0759b66eebce151
+ F vsixtest/MainPage.xaml.cpp 7f31fc6de751b64676c0924c97a5485d950a91d7
+ F vsixtest/MainPage.xaml.h cc05cca10d50a003f6c6e4448b701cdd07f52f29
+ F vsixtest/Package.appxmanifest 6b6db1eb7df3a315c5d681059754d5f0e0c47a93
+ F vsixtest/pch.cpp cb823cfac36f1a39a7eb0acbd7e9a0b0de8f23af
+ F vsixtest/pch.h 9cab7980f2ac4baa40807d8b5e52af32a21cf78c
+ F vsixtest/vsixtest.sln 77cadbe4e96c1fe1bf51cd77de9e9b0a12ada547
+ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
+ F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
+ F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
+ F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
 -P ed128e8b826cd9620b7146d01d461ed28b9a672d
 -R 27e5e4c2995b5324778005dedfa90fe5
 -U drh
 -Z ed5acb084f4d8b134ae4eeee3cdc81ad
++P 39759a553208d8ef72964bdd539a0883e1d99cf6 cf569f9f2fab1828e4bfced111fd9a6ee23ea8c0
++R d0ec40008a4450baf3f01589e83f54d1
 +U mistachkin
- Z 786b4c57551387fde5512893dcf278e2
++Z eaa4bb84d513df9cfd663fcd7451f96e

diff --cc manifest.uuid
index 4891a746f36417ef779a2f2493178d4ad7925ff4,cf9761250d9e3805dc52992988f2489215a9d172..7454ecb7b8ef2ac45ef59e8976be4f4336b7b277
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 39759a553208d8ef72964bdd539a0883e1d99cf6
 -cf569f9f2fab1828e4bfced111fd9a6ee23ea8c0
++00990020d07d7c87b922cdbfa5373298a86bb4b3

diff --cc src/date.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge