Merge the latest trunk fixes and enhancements into the apple-osx branch.

FossilOrigin-Name: ba8294e2f76a0cfcf48200634e6076a8995024f0

diff --cc manifest
index 3ae8204127ae5c70c8411ea0a9bdf52a3e917e8d,d67728f0c0459af6d478a79ca848ecb8a2610e24..4ee3dd5fce5f53126619aa5188dc0637e8d98dc5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
- D 2015-02-21T01:03:48.964
 -C Add\ssupport\sfor\sthe\slinenoise\scommand-line\sediting\slibrary\sin\sshell.c.
 -D 2015-02-25T13:48:10.884
++C Merge\sthe\slatest\strunk\sfixes\sand\senhancements\sinto\sthe\sapple-osx\sbranch.
++D 2015-02-25T14:09:23.835
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
 +F Makefile.in e1f1fce0d47e29ffae67c92834d0e6e1c699743e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc fc6b0b233b5621f3e56298e4d6a0b3f6c936c520
+ F Makefile.msc edbe2e2a9d27a4a56bd2891808a7c013bc322f6e
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
@@@ -233,13 -230,12 +233,13 @@@ F src/printf.c 8da9a2687a396daa19860f4d
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 -F src/select.c e46cef4c224549b439384c88fc7f57ba064dad54
 +F src/select.c 66c2fce5d5a413915c2c3d989e2bc00e5e905f00
- F src/shell.c 6276582ee4e9114e0bb0795772414caaf21c0f8e
- F src/sqlite.h.in 6983c500b35cceeb8058292f593a18797e0c5cca
+ F src/shell.c f06cca68a3f07e03d35d2f879375967169db6a61
 -F src/sqlite.h.in 86cddbfdb3155967858c1469108813bcc08eda21
++F src/sqlite.h.in 69334ebae24f5a241890a99d819ec13c9d0a0d3c
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 -F src/sqliteInt.h 57a405ae6d2ed10fff52de376d18f21e04d96609
 +F src/sqliteInt.h 399d21875c6ae7b03b09b8e97ff639719fccc095
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -307,12 -303,12 +307,12 @@@ F src/vdbemem.c 31d8eabb0cd78bfeab4e512
  F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c 699f2b8d509cfe379c33dde33827875d5b030e01
 -F src/wal.c 39303f2c9db02a4e422cd8eb2c8760420c6a51fe
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 61a28dad1a098848a09702a938d515edde5c5a09
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c d46de821bc604a4fd36fa3928c086950e91aafb1
+ F src/where.c a50d5082b0fecd2bcf1725cdd012732d9d1e9d5c
  F src/whereInt.h d3633e9b592103241b74b0ec76185f3e5b8b62e0
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -1244,7 -1239,8 +1244,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 82c4c4e248bfca38bc3285d5a8414f7180c2eab5 c299e55a661c04f71ab43cb8aed04f8ece6e0567
- R e9c989f2bc42f6e5000d27318d2c6c85
 -P 034c16bd24ddca363946a4b8751418469d890d2a f7f2598c376a27a86acc21578779c03d0016cd30
 -R 39a5a9d65bc63648e34cb80c3dc9dec4
 -T +closed f7f2598c376a27a86acc21578779c03d0016cd30
++P 3896e23373d41371fc6839168a97a669106486af 03bbb947192b0c28d960604eae12e5fc2fa6e74e
++R f75793a6656523174b46c9813cd2d7cf
  U drh
- Z 3c26de8e63c7af1b725fdcce7277f831
 -Z c8318c1240f80cb8fe06db610b0ca5b1
++Z 20b31072cb0711dea72979ae2a5b442f

diff --cc manifest.uuid
index dbc12d8776745464cf89ea34c6aee5f2def277c1,acb199a50a1c83513710469f4e4f2f8c1a7dd965..ffac4fc8d24c257231816b041854dead9db14326
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3896e23373d41371fc6839168a97a669106486af
 -03bbb947192b0c28d960604eae12e5fc2fa6e74e
++ba8294e2f76a0cfcf48200634e6076a8995024f0

diff --cc src/sqlite.h.in
Simple merge