Update the sessions branch with all the latest changes from trunk.

FossilOrigin-Name: 0f347fbfc7d8821f56f1ae0d1a9472a375631e65

diff --cc manifest
index e54c95b9a594f05bb7953e493494037bcc7eeed1,4f0a71bacab675f6df91ebe3ea7255990d1724df..aafc8db59deaa19c19e8fc27291b6f09f73ed5f9
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2012-04-19T20:00:31.443
 -C Update\sa\stest\sin\sio.test\sto\saccount\sfor\s[05f98d4eec].
 -D 2012-05-01T14:21:57.706
++C Update\sthe\ssessions\sbranch\swith\sall\sthe\slatest\schanges\sfrom\strunk.
++D 2012-05-04T23:31:14.883
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -191,13 -171,13 +183,13 @@@ F src/pragma.c e708b3bb5704605816f617e0
  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 ad55acc42422c461719f3adaee434836ab00677b
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 -F src/sqliteInt.h c5e917c4f1453f3972b1fd0c81105dfe4f09cc32
 +F src/sqliteInt.h 572c5e6aca50256bdbc34919ece5f660dabf25cc
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -709,6 -689,11 +702,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
@@@ -740,7 -725,7 +738,7 @@@ F test/tclsqlite.test 2f2aa887763af3064
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
- F test/tester.tcl a3e41436033f39f7009de8bc4cb0de09d63f500a
 -F test/tester.tcl 17b5f402d0e60e8c8ce751288b228fe9337f40c2
++F test/tester.tcl e9e495e68f7c5e0e17561acdfcb59ca6679ff019
  F test/thread001.test 7cc2ce08f9cde95964736d11e91f9ab610f82f91
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1013,7 -995,7 +1008,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 87a0eab5d98fff93aa2147c04c4af27be42fb365 3281972eaa46cb57fd9f0387063f47430dc0a3b4
- R 9636c18c52011b532bece9e648b40abc
 -P 1e51bffe777587cd05bd7db5e02d6291c3eb8c1a
 -R 2c954175673c357079573f576ee6e960
 -U dan
 -Z 199b9a45180c95acb6ae422881191984
++P 2b7a91e61794ce9ffe210bad584454e52c79924e bfa61e781cb442be641486e7e55a1518e888d830
++R bed2e7cce64395c916783d9e3080c791
 +U drh
- Z 8c2c5ae91a3dd05ffa0247cd525ea466
++Z 95959a45df2928e15269c2ba6866d087

diff --cc manifest.uuid
index 7bfab0804f0d3833dedf3c8b233db3663dafee38,8d74f647e35e9b57920688894fb8c5d0d914a175..80a7fa99b724d2962c6b8d9dc8fd91f29bc5c55d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2b7a91e61794ce9ffe210bad584454e52c79924e
 -bfa61e781cb442be641486e7e55a1518e888d830
++0f347fbfc7d8821f56f1ae0d1a9472a375631e65

diff --cc test/tester.tcl
Simple merge