Merge trunk changes into this branch.

FossilOrigin-Name: 9021f7369f4b32db6126b3dc0ac75d11039625be

diff --cc manifest
index 4c65a4a62a8395ac77e7fb5408825e39d1e9ecc8,667104cb0737d1f29b4b0d8fea87918efb8d7e93..ccebc082883e639f5de2944c46cb041298d43e7f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\smany\sminor\sissues\sin\sthe\sunlocked\stransaction\scode.
- D 2015-08-21T20:11:23.106
 -C Add\sa\smissing\s#define\sfor\ssqlite3_vsnprintf\sto\ssqlite3ext.h.
 -D 2015-08-21T19:53:06.112
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2015-08-22T07:55:08.264
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -338,10 -338,10 +338,10 @@@ F src/resolve.c 7a67cd2aebc9a9eeecd1d10
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c c46de38c1b66355f02a839bb72eb13f277e6d19c
  F src/shell.c b1f91e60918df3a68efad1e3a11696b9a7e23d23
- F src/sqlite.h.in 447ead0a6b3293206f04a0896553955d07cfb4b9
+ F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h a0b948ebc89bac13941254641326a6aa248c2cc4
+ F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
 -F src/sqliteInt.h 89e68539d645db597366a91411468b51e73c21a0
 +F src/sqliteInt.h d4963f5f6b985b8f967be8e6e103be3cf36f1f42
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -1378,7 -1376,7 +1378,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 069679162d8d50e9731831e658aa58f280dbb3e7
- R 98654e6b793f843bd7dce43cd408dae9
 -P 53b593fcae178f2e08f758ae6fd100869f771bfd
 -R ebc4801d5f618bfa6944c04f2d984190
 -U drh
 -Z 0c4320af06ae345cfafae29306ed4bea
++P 53aaeea6c98f82f3b55d4b3ab139ee41b727243c da3c9df09c46564353218d0163e378b880a3ce62
++R 116680cc2378bd296eca514a508d2e03
 +U dan
- Z 8f0a71142a3eb918cc8670c51bd39224
++Z 84908ef388a25122ca565349eedf9c7b

diff --cc manifest.uuid
index c4520623e373240be8cd5c5e29308c7ea6dfd605,646c99b26adb0873b14724a86def5b04c506701e..74c876ab45abfc00b03dcae0eeb04aa08310da1e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 53aaeea6c98f82f3b55d4b3ab139ee41b727243c
 -da3c9df09c46564353218d0163e378b880a3ce62
++9021f7369f4b32db6126b3dc0ac75d11039625be