Merge in the latest trunk changes.

FossilOrigin-Name: 5ed31c8279a4f465b982df5dc20cefc286928b93

diff --cc manifest
index 70d136a298c79bcc02838bb332afbd50331055c7,525586f02f2fb9de6ee5a634d2e06f7587c123a9..57a0d630011a8a8b353a217e6b468689573098ef
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Free\sup\sbits\sof\swsFlags\sfor\sreuse.\s\sInstall\sthe\sORDER\sBY\soptimization\ninfrastructure\sfor\sthe\sNGQP.
- D 2013-05-10T02:00:35.314
 -C Add\sassert()s\sto\sthe\simplementation\sof\sxRead()\sin\sthe\sbuilt-in\sVFSes\sto\s\nverify\sthat\sthe\soffset\sparameter\sis\salways\snon-negative.
 -D 2013-05-09T18:12:40.898
++C Merge\sin\sthe\slatest\strunk\schanges.
++D 2013-05-10T02:11:40.008
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -194,7 -195,7 +195,7 @@@ F src/shell.c 2109d54f67c815a100abd7dc6
  F src/sqlite.h.in 5a5a22a9b192d81a9e5dee00274e3a0484c4afb1
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5
- F src/sqliteInt.h b4411cfc1c7803cdf393975d5420b4da0d8dd1c4
 -F src/sqliteInt.h 4cc782c9a89b3ddd663e7f68af3fa9e5af596f8b
++F src/sqliteInt.h fab5580c75a16dced398bdd249c0409c9441b466
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -261,9 -262,9 +262,9 @@@ F src/vdbesort.c 4fad64071ae120c25f39dc
  F src/vdbetrace.c 3ad1b4e92b60c082a02ac563da4a2735cc7d297c
  F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
  F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
- F src/wal.h a4d3da523d55a226a0b28e9058ef88d0a8051887
+ F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
- F src/where.c 2be67c1a1a018b1de91f08e48baa02db13652e40
 -F src/where.c 5c4cbc1e5205d8d534c483fa4495c81513b45dea
++F src/where.c 4816e3ec624c96b5169f0cc83dbb5cf459ce3fd1
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@@ -1060,7 -1062,7 +1062,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 3c2e83a4a2c5e85202162feeb37ef7a3911c05a3
- R fe9c54bd236af22a2f9e27cec8708db5
 -P 1128575d0ab24f7023a0f6e6ce4828b9a09a7c6c
 -R 1cad29e868ca8cf8d5b7d354acd90934
++P 82d50e198025a2fdb8ee733edb8419d388ee5362 cf5c3642247fdd34d87f0368594cd7b8f081636a
++R bed3d93321566d3c8fda15cb3370678a
  U drh
- Z c9a2e102e5146d5a293863d252ad4424
 -Z 3b3f34da85296e9879a826be138cb510
++Z 9d7433ee1472cd0008b2ab99b16fa998

diff --cc manifest.uuid
index 5c1c65ebf97a99a6d89c08735bf283a397359ff1,03a8fec162bfe28946a339957f24df516cc23161..64be8db9ebdd2e4bf42109612c74cb207739eca1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 82d50e198025a2fdb8ee733edb8419d388ee5362
 -cf5c3642247fdd34d87f0368594cd7b8f081636a
++5ed31c8279a4f465b982df5dc20cefc286928b93

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/where.c
Simple merge