Merge recent trunk changes into the STAT4 branch.

FossilOrigin-Name: c69b512af276a438399747af22659415af3a5d4d

diff --cc manifest
index 55b717508b077ff409e6371547ad22efb960affb,87a62738cb73ac44108d04adfb91cf1ee8e5d6d9..bb48b65cf5c03e3bf13c64d5413ea4d8b66c4d3b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\scrash\sthat\scan\soccur\sif\sthe\ssqlite_stat3\sor\ssqlite_stat4\stable\sis\scorrupt.
- D 2013-08-15T19:56:32.997
 -C Make\ssure\sthat\sGROUP\sBY\sterms\sselect\sinput\scolumn\snames\sin\spreference\sto\noutput\scolumn\snames,\sin\scompliance\swith\sthe\sSQL\sstandard.\nTicket\s[1c69be2dafc28].
 -D 2013-08-15T22:40:21.803
++C Merge\srecent\strunk\schanges\sinto\sthe\sSTAT4\sbranch.
++D 2013-08-16T12:26:33.317
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -214,14 -214,14 +214,14 @@@ F src/pragma.c 590c75750d93ec5a1f903e4b
  F src/prepare.c fa6988589f39af8504a61731614cd4f6ae71554f
  F src/printf.c 41c49dac366a3a411190001a8ab495fa8887974e
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 17e670996729ac41aadf6a31f57b4e6f29b3d819
+ F src/resolve.c 9d53899cc6e1f4ec0b4632d07e97d57827bf63b9
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 8b148eb851f384412aea57091659d14b369918ca
 -F src/shell.c 927e17b37b63b24461e372d982138fb22c4df321
 +F src/shell.c 128eb16ccec68509a4a2f1948f2483819bf63425
  F src/sqlite.h.in bd1451ba1ab681022a53bccc3c39580ba094a3ff
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 35ee14455ae3cb21b166fea7777867a42c60d0d5
 -F src/sqliteInt.h b2a4e9a85e4bb49c1537fe7fc6532cd7ebe82aa0
++F src/sqliteInt.h 85cc797544e30cf585507b2127b4a3f60478c849
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1107,7 -1105,7 +1107,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 9f80b2687012ab7c4d6d654fe19f40878bd78bd8
- R abb1a9d20998265ab3bcabc4adb13b2c
- U dan
- Z 4cffc531446b09bd876c8b206583a719
 -P c78b357c00a35ed48ce2ffbc041de8d22570d1e2
 -R 0cad26d57aaadc86e4d0689961c53035
++P d51df8a8fcc31c37f6e1c9612204af5738ed865e f2d175f975cd0be63425424ec322a98fb650019e
++R a01801631ed4ae55018a7d07c406419f
+ U drh
 -Z 9ac8068bb659c66e2e7c0f0532626e1f
++Z 2e42de2ef767503ad01b3c8e93c6139b

diff --cc manifest.uuid
index 3e8d68298e220708354b462734a916534ca06512,cb7ffe874849d2eb9ea6df4224da8fbf58d0ba03..564eb232afa5b78160b05d08189e97a361a53d50
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d51df8a8fcc31c37f6e1c9612204af5738ed865e
 -f2d175f975cd0be63425424ec322a98fb650019e
++c69b512af276a438399747af22659415af3a5d4d

diff --cc src/sqliteInt.h
Simple merge