Sync the latest trunk changes into the winRT branch.

FossilOrigin-Name: be4ab188cffbe97ae4f1f0520591bb7f0df185de

diff --cc manifest
index 826b1f2988659a52283ac9423e110a7c5b978fcd,4f0a71bacab675f6df91ebe3ea7255990d1724df..a2099b7f92e12a6b3f6fd4d38c5d8ee6c6b27495
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sWinRT\sbranch\s(fixes\sfor\stickets\s[2a5629202f]\sand\s[385a5b56b9]).
- D 2012-04-21T00:31:21.773
 -C Update\sa\stest\sin\sio.test\sto\saccount\sfor\s[05f98d4eec].
 -D 2012-05-01T14:21:57.706
++C Sync\sthe\slatest\strunk\schanges\sinto\sthe\swinRT\sbranch.
++D 2012-05-04T23:11:21.989
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -160,8 -160,8 +160,8 @@@ F src/os.h 38aabd5e3ecd4162332076f55bb0
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
  F src/os_unix.c 424d46e0edab969293c2223f09923b2178171f47
 -F src/os_win.c 5e9e933a412ab35de2a6506b3c6a8295b31b309e
 +F src/os_win.c c3487c9c506c1253bb4c65abc3caf988b9addb6c
- F src/pager.c 85988507fa20acc60defb834722eddf4633e4aeb
+ F src/pager.c bb5635dde0b152797836d1c72275284724bb563c
  F src/pager.h ef1eaf8593e78f73885c1dfac27ad83bee23bdc5
  F src/parse.y eb054bb40a5bf90d3422a01ed0e5df229461727a
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
@@@ -171,11 -171,11 +171,11 @@@ F src/pragma.c 149d8400ff783741d4138917
  F src/prepare.c ec4989f7f480544bdc4192fe663470d2a2d7d61e
  F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 969ec2bc52db1b068054ecf5ddc74f244102a71d
+ F src/resolve.c 748e75299faff345f34f0e5bd02a2bac8aa69fcd
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
  F src/select.c d7b9018b7dd2e821183d69477ab55c39b8272335
- F src/shell.c 11185a9a4574f363bd4268a2780d37480ae00040
+ F src/shell.c 04399b2f9942bd02ed5ffee3b84bcdb39c52a1e6
 -F src/sqlite.h.in 4338f299fc83dada8407358d585c0e240ecb76a3
 +F src/sqlite.h.in 21eb2ff783710a8cf2b435890dc1ffc750058169
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
  F src/sqliteInt.h c5e917c4f1453f3972b1fd0c81105dfe4f09cc32
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
@@@ -688,6 -689,11 +689,11 @@@ F test/shared6.test 866bb4982c45ce216c6
  F test/shared7.test 960760bc8d03e1419e70dea69cf41db62853616e
  F test/shared_err.test 91e26ec4f3fbe07951967955585137e2f18993de
  F test/sharedlock.test ffa0a3c4ac192145b310f1254f8afca4d553eabf
 -F test/shell1.test 7dcd612b0018ddad783647d984fffa76791ffd3d
 -F test/shell2.test 037d6ad16e873354195d30bb2dc4b5321788154a
 -F test/shell3.test 9196c42772d575685e722c92b4b39053c6ebba59
 -F test/shell4.test aa4eef8118b412d1a01477a53426ece169ea86a9
 -F test/shell5.test fa2188bbb13fe2d183fd04a5f7b512650c35ef5d
++F test/shell1.test 7dcd612b0018ddad783647d984fffa76791ffd3d w tool/shell1.test
++F test/shell2.test 037d6ad16e873354195d30bb2dc4b5321788154a w tool/shell2.test
++F test/shell3.test 9196c42772d575685e722c92b4b39053c6ebba59 w tool/shell3.test
++F test/shell4.test aa4eef8118b412d1a01477a53426ece169ea86a9 w tool/shell4.test
++F test/shell5.test fa2188bbb13fe2d183fd04a5f7b512650c35ef5d w tool/shell5.test
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/shrink.test 8c70f62b6e8eb4d54533de6d65bd06b1b9a17868
  F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
@@@ -719,7 -725,7 +725,7 @@@ F test/tclsqlite.test 1597d353308531527
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
- F test/tester.tcl d06382066250b1c68b199d3656d090db5f9a9a16
 -F test/tester.tcl 17b5f402d0e60e8c8ce751288b228fe9337f40c2
++F test/tester.tcl e1e5d5bc3453338ec7fded894614e059a5ce2c6a
  F test/thread001.test 7cc2ce08f9cde95964736d11e91f9ab610f82f91
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -994,7 -995,7 +995,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 294a5cca5087b510c2483792631bbf98a415e254 7b8548b1872cc1225355ba8311e93dd08d6526e2
- R dd7224aee3a3a8ff8a26727b1243ba57
- U mistachkin
- Z 89bcb246fbfedd2e196bdf30f9fdc4fa
 -P 1e51bffe777587cd05bd7db5e02d6291c3eb8c1a
 -R 2c954175673c357079573f576ee6e960
 -U dan
 -Z 199b9a45180c95acb6ae422881191984
++P 25478dcff59690a5f59c3b96600374184057eae9 bfa61e781cb442be641486e7e55a1518e888d830
++R ce5ef0f680ccee96865eacdf6d030fb3
++U drh
++Z e6cad85cf7d7f8dd84e66fcbcd8c3674

diff --cc manifest.uuid
index df49ee4333dcb34c7dbe86e84e6ba98c450b1863,8d74f647e35e9b57920688894fb8c5d0d914a175..f0736b428d0cefa9eac88fa9f43952b647e1f036
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 25478dcff59690a5f59c3b96600374184057eae9
 -bfa61e781cb442be641486e7e55a1518e888d830
++be4ab188cffbe97ae4f1f0520591bb7f0df185de

diff --cc test/tester.tcl
Simple merge