merge fixes from trunk

FossilOrigin-Name: faf7f9caf526ab33a6fdb9c89b45a0483510db21

diff --cc manifest
index 1724c9322b29799ce30e32a02237c4f59aee1fd1,b22c63dd889c3de6ce9203bb22818a0487be686d..140d5c124cb9f8910d2c38190a3ad92809ad2e1e
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Use\sonly\sa\ssingle\sOP_MakeRecord\sinstead\sof\stwo\swhen\sconstructing\sentries\nto\sgo\sonto\sa\ssorter.
- D 2014-03-23T17:45:03.365
 -C Avoid\sa\spossible\suse\sof\san\suninitialized\svariable\sfollowing\san\sI/O\sor\sOOM\nerror.
 -D 2014-03-23T16:29:23.966
++C merge\sfixes\sfrom\strunk
++D 2014-03-23T18:47:00.384
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -217,7 -217,7 +217,7 @@@ F src/printf.c e5a0005f8b3de21f85da6a70
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c b1e0ac15d846c1d584c26f95bd92e887313b55df
 -F src/select.c 269c3e31a450fce642a10569221a49180348c88e
++F src/select.c 09fef04ec0746d168ddcff37031ee804ac19dd0e
  F src/shell.c cee9f46f2688a261601b1fd3d7f4b3cddf9b5cdf
  F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
@@@ -1157,7 -1157,7 +1157,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 71e9ae72c272dc86720b2bfe719f57de437c400b
- R d93a4c6f8aefee44f30ed73f4e05ae09
 -P 9b2838f23e5f52369eeb078f60bd231cc54362f8
 -R 5e47a0912e77eb3fe11c659549f1088a
++P d696cdedacd39075aa7fc407ab7c7e50f01d9f39 641408a1395bfc911ca619ef9e5f073b913d856b
++R e64080ab6e1cc6573ca05b14626c10fb
  U drh
- Z 5ef6faddb00682067ed8bb051e6b9892
 -Z 7a01e94679f2d88e0c9f56d7135921af
++Z 0df19c139e23d451d51cd0e8cf9cddd3

diff --cc manifest.uuid
index b62e4b84bda7b1f57eb7159f2bcd86c5d58b314b,7e88ad746fc4501b48b4a0fa7330b91b772e9b7c..49e295d769fce355ff362426d8e5b5ec101826e0
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d696cdedacd39075aa7fc407ab7c7e50f01d9f39
 -641408a1395bfc911ca619ef9e5f073b913d856b
++faf7f9caf526ab33a6fdb9c89b45a0483510db21

diff --cc src/select.c
Simple merge