Merge the latest trunk changes into the winrt branch.

FossilOrigin-Name: a1a85b846aac07979e732a9f36d178bd567e103a

diff --cc manifest
index 5d5fe7e76129433156764db08f628c68b150aa47,0881a2a23e789df54a54cfd2d41a459be55d4f27..aedf5960039473e9aded22922ceb7efe1795261f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Simplify\sthe\swinRead\sand\swinWrite\sVFS\sfunctions\sto\sreduce\sthe\snumber\sof\ssystem\scalls.
- D 2012-03-30T12:27:55.620
 -C Fix\san\sFTS4\stest\sscript\sproblem\sfor\swindows.
 -D 2012-03-30T13:34:17.656
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\swinrt\sbranch.
++D 2012-03-30T14:01:40.977
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4
 +F Makefile.msc 47c5fd7e41e773835f78e2d8d32f67b0c8734113
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION bb4c2a86abe53ea3c1d6ea515b69a426040e2414
+ F VERSION f9313d88cb77df8617059a88eb382291321ef6bc
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/2005osaward.gif 0d1851b2a7c1c9d0ccce545f3e14bca42d7fd248
@@@ -125,19 -126,19 +126,19 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c 6be23a344d3301ae38e92fddb3a33b91c309fce4
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 253c3147a4ebbaee42cd329dbdc0856200bbbda7
+ F src/btree.c 02aeee1f6d425e11f7b9b2d9d461ac501645ed6f
  F src/btree.h 48a013f8964f12d944d90e4700df47b72dd6d923
  F src/btreeInt.h 26d8ca625b141927fe6620c1d2cf58eaf494ca0c
- F src/build.c c4d36e527f457f9992a6663365871dfa7c5094b8
+ F src/build.c 139dc386ebdaa78d2198247ebcf003305a5babe3
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 -F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
 +F src/ctime.c 500d019da966631ad957c37705642be87524463b
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
- F src/delete.c 51d32f0a9c880663e54ce309f52e40c325d5e112
- F src/expr.c 00675123e0beec98f999aa4594d2cbe1fec33c1b
+ F src/delete.c 4c20ea4f6213b3bc1c6a510586864b679946e05e
+ F src/expr.c 7e40ea9f6899e31134be3c1b88b8347cf9ec40d7
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
- F src/func.c e75f41c421f00762ab9da7dc8fb90af3972cf99f
+ F src/func.c c6b3c94320253a35bda43fb69cc292618e3285d6
  F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@@@ -167,10 -168,10 +168,10 @@@ F src/os.h 38aabd5e3ecd4162332076f55bb0
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
  F src/os_unix.c 0e3d2942d228d0366fb80a3640f35caf413b66d1
 -F src/os_win.c 5ac061ae1326a71500cee578ed0fd9113b4f6a37
 +F src/os_win.c 6f8080e783082d3d94ea56537f2248df4e273843
- F src/pager.c 3955b62cdb5bb64559607cb474dd12a6c8e1d4a5
+ F src/pager.c 85988507fa20acc60defb834722eddf4633e4aeb
  F src/pager.h ef1eaf8593e78f73885c1dfac27ad83bee23bdc5
- F src/parse.y 1ddd71ae55f4b7cbb2672526ea4de023de0f519e
+ F src/parse.y 537c8db136af5f481630becdc0c8bdd36a704c30
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
  F src/pcache1.c b30b1c35908346ecc43d8d9d17f2ddf6817f8f60
@@@ -180,16 -181,16 +181,16 @@@ F src/printf.c 7ffb4ebb8b341f67e049695b
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 3d3e80a98f203ac6b9329e9621e29eda85ddfd40
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c 44ccdcb5d2a1c48622c179b2d72167b716388581
- F src/shell.c aa28f117033ba3e44b5eaaf2ad572222bcdfd66e
- F src/sqlite.h.in a3516084e920db2599c76f1286123adec5b20c37
+ F src/select.c f6f141cb1ea13f1e6564d3e162700e4937baa2a1
+ F src/shell.c abf18d6ee54f2631860a98fdd7ab1327f470db67
 -F src/sqlite.h.in 11a883919b0baf4ffaa7550cfeef99be613ec2bf
++F src/sqlite.h.in d7f0850ad874328e7ca477f836e8c5d189fbc7a2
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h e65429a6f19b41720561b9434b2192574a91cfa2
+ F src/sqliteInt.h 3756ece33f1e7f8fe2adf8e523566825c809316e
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
- F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
+ F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 2aeb69958965dad0842d5ea1456f1a958ef296e6
+ F src/tclsqlite.c 086dfdd72e5892de223968a258e1ccbd9693e717
 -F src/test1.c 07f30e8714bab94d8de8a88865d9c59bc512a1a8
 +F src/test1.c 1a1df7eed3e8b58987b5716de7a37cc79a10f3f2
  F src/test2.c 711555927f1f7e8db9aab86b512bc6934a774abe
  F src/test3.c 91d3f1a09cfae3533ef17d8b484a160f3d1f1a21
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -295,9 -296,10 +296,10 @@@ F test/backup_ioerr.test 40d208bc9224b6
  F test/backup_malloc.test 7162d604ec2b4683c4b3799a48657fb8b5e2d450
  F test/badutf.test d5360fc31f643d37a973ab0d8b4fb85799c3169f
  F test/badutf2.test f5bc7f2d280670ecd79b9cf4f0f1760c607fe51f
+ F test/bc_common.tcl 5c8689cc6d2fb44b7c0968ae4f85eb26d50022fa
  F test/between.test 16b1776c6323faadb097a52d673e8e3d8be7d070
 -F test/bigfile.test 82dfe93ee7eb9e2e05641afa2b39ffd947a92ff1
 -F test/bigfile2.test 852f948cb492aadab45b58f4d2f3b0832a115cb0
 +F test/bigfile.test 8f88b5ef065e31c615c49d725ede94155fbe9609
 +F test/bigfile2.test 8a3c242c3c3481e7cde5a6ef2a66fdc367a095f7
  F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747
  F test/bind.test 3c7b320969000c441a70952b0b15938fbb66237c
  F test/bindxfer.test efecd12c580c14df5f4ad3b3e83c667744a4f7e0
@@@ -625,7 -632,7 +632,7 @@@ F test/notnull.test cc7c78340328e6112a1
  F test/null.test a8b09b8ed87852742343b33441a9240022108993
  F test/openv2.test 0d3040974bf402e19b7df4b783e447289d7ab394
  F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3
- F test/pager1.test 41995062277f6b9c5d57ce074e814ea4285a5c76
 -F test/pager1.test eb6d64d2e148dc4bfc6420605bee3717e2d5f10c
++F test/pager1.test 819a0ecc0ecf4850155cf18dcd2754121d1018b3
  F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pagerfault.test 452f2cc23e3bfcfa935f4442aec1da4fe1dc0442
@@@ -635,8 -642,8 +642,8 @@@ F test/pageropt.test 9191867ed19a2b3db6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test 2b5a1b64a8e5114757457fbce9010387d1fe7682
+ F test/permutations.test dbda172249564f43ec556108a704581044c57dbd
 -F test/pragma.test c51c148defe32bf4a419a522f95d26838d5cf677
 +F test/pragma.test eba5bd337ae68870985cd1776659bb136b33dada
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -992,7 -999,7 +999,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P c10794bfac0989c611ec3ea98d069cb9631a7b15
- R 23bdb0c42f14336dabd08b128245de8d
- U mistachkin
- Z 736498e20bf38fd876d04def8440845b
 -P cbdd86387630600b309de4aaeaa131ec7b053ce2
 -R 88f6eca232fcd821cd715bbadb803c37
++P 10ce846759f6f22e70bb9b67bea7a0c2b8a156fe 36aa6665e709b5942b3558afbd555058b42f2c78
++R cfe4287a455a52ef8be1acca1474bbf5
+ U drh
 -Z a41a68a88bffc936799088c08283176f
++Z 8c9488054f5fc194d8a0020e67475da7

diff --cc manifest.uuid
index 2a88abb7683d9ad8f08da7e445c1c949d922bc70,03525e8dd37e3f6dba5d3b8deabe5271fc7c67df..766627434072b3629a24ad1e17234318fa99f451
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 10ce846759f6f22e70bb9b67bea7a0c2b8a156fe
 -36aa6665e709b5942b3558afbd555058b42f2c78
++a1a85b846aac07979e732a9f36d178bd567e103a

diff --cc src/sqlite.h.in
Simple merge

diff --cc test/pager1.test
Simple merge