Merge the latest trunk changes into the NGQP branch.

FossilOrigin-Name: 7c8f992c04504a132686ad0652efdff19e43480d

diff --cc manifest
index f6c1ed6e1d02b6709cd68434a596f4e78dd69a83,cf297405cbf3aa140367abfde2ee8ffcecfd340a..579e93906021f6a08f3221d99325bcd0e6f370bb
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Use\sthe\sNGQP\splan\sfor\sEXPLAIN\sQUERY\sPLAN\soutput.\s\sThis\schange\scauses\s207\nerrors\sin\sveryquick.test,\smany\sof\swhich\sare\sbenign.
- D 2013-05-22T20:49:02.170
 -C Set\s_XOPEN_SOURCE\sto\s600\sso\sthat\sfchmod()\swill\s(hopefully)\swork\son\sFreeBSD.
 -D 2013-05-24T12:47:26.703
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sNGQP\sbranch.
++D 2013-05-24T13:55:23.561
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in f6b58b7bdf6535f0f0620c486dd59aa4662c0b4f
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -196,7 -196,7 +196,7 @@@ F src/shell.c 9a18124ff209ca308d786c99a
  F src/sqlite.h.in 5a5a22a9b192d81a9e5dee00274e3a0484c4afb1
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5
- F src/sqliteInt.h 3b89d4517d984363a96f6f7b348440e01f13ced3
 -F src/sqliteInt.h ba610d80822135ffbc92ac90710939e548c6a850
++F src/sqliteInt.h 0b0ba16c1449d0e7ef6ff78039ffef38f58f585a
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1065,7 -1066,7 +1066,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 9bf0524df7ca2e7fcd92b2878a8457264b3c7f6e
- R 97f27b7ea9f3efcce127b9443ade87ed
 -P 9e2c17c5358b156b588542dbba38da7fedf5302b
 -R 447bfb9d68d03e84058ef9e235e367ce
++P f783e8e6b10de44029c7c5f57e4648a4a677ca1b 61a10452399db28cd5ea4ba9d416b87a34c2eddb
++R 5ae2bb9eca4144ac9f28ec145cae1f78
  U drh
- Z 96c17883fc9fb8d90fa5ada1b6415a79
 -Z 0a3675dfa27f37f077377df6c72c7598
++Z e63f19ec26c366b47598ade89ccbddd5

diff --cc manifest.uuid
index 0de3a8524ff669a6593d84e927ab3a0d5c5af0fe,d490615225922ffd850855b08cfe5e33804c5a69..1dd79ce63e88406b5875574f02260472f4676361
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f783e8e6b10de44029c7c5f57e4648a4a677ca1b
 -61a10452399db28cd5ea4ba9d416b87a34c2eddb
++7c8f992c04504a132686ad0652efdff19e43480d

diff --cc src/sqliteInt.h
Simple merge