From: drh <drh@noemail.net>
Date: Wed, 1 Oct 2014 01:52:42 +0000 (+0000)
Subject: Merge the latest enhancements from trunk.
X-Git-Tag: version-3.13.0~148^2~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=595db25b2890e493e978796a439f66925d8a1e3d;p=thirdparty%2Fsqlite.git

Merge the latest enhancements from trunk.

FossilOrigin-Name: 2695772c984c215649a16e1e3e18a8048a6a60dd
---

595db25b2890e493e978796a439f66925d8a1e3d
diff --cc manifest
index 36205b94dd,4f1b85c92d..001d216d17
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Change\sthe\snames\sof\sthe\sstream\sinterface\sAPIs\sto\sbe\sof\sthe\sform\n"_strm"\sinstead\sof\s"_str".\s\sIn\sother\swords,\sadded\san\s"m"\sto\sthe\send,\sto\ntry\sto\smake\sit\sclear\sthat\swe\sare\stalking\sabout\sa\s"stream"\sand\snot\sa\s"string.
- D 2014-09-27T20:45:48.295
 -C Improvements\sto\sthe\snew\ssyntax-tree\soutput\sroutines:\s\sOmit\sthe\s"END\sSELECT"\nmark\sand\sinstead\sterminate\sthe\sgraph\sat\sthe\slast\sitem.\s\sIncrease\sthe\smaximum\ntree\sdepth\sto\s100.
 -D 2014-09-30T19:04:41.396
++C Merge\sthe\slatest\senhancements\sfrom\strunk.
++D 2014-10-01T01:52:42.892
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 +F Makefile.in dd5f245aa8c741bc65845747203c8ce2f3fb6c83
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
 +F Makefile.msc 35808af7f8d999176ed5b38fb482a87a129ee3e1
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 53a0b870e7f16d3b06623c31d233a304c163a6af
@@@ -196,8 -180,8 +196,8 @@@ F src/callback.c 7b44ce59674338ad48b0e8
  F src/complete.c 535183afb3c75628b78ce82612931ac7cdf26f14
  F src/ctime.c bb434068b5308a857b181c2d204a320ff0d6c638
  F src/date.c 57a7f9ba9f6b4d5268f5e411739066a611f99036
 -F src/delete.c fae81cc2eb14b75267d4f47d3cfc9ae02aae726f
 +F src/delete.c de3d07d6602b90ae6e8bdebeb7b3265bb846377f
- F src/expr.c f32119248996680aa73c5c37bfdd42820804dc17
+ F src/expr.c 46a8ca93361d09f2ec6d9b7d524751510569d737
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
  F src/func.c ba47c1671ab3cfdafa6e9d6ee490939ea578adee
@@@ -210,7 -194,7 +210,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
- F src/main.c 1010acfb69ccd62e34e3b83664537450225c74e2
 -F src/main.c 4a507a467cc20979579e4320ca6466b8ed0be268
++F src/main.c c603e28922b78643c4e0747cac356cfb23d599b9
  F src/malloc.c 5bb99ee1e08ad58e457063cf79ce521db0e24195
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@@ -243,12 -227,12 +243,12 @@@ F src/printf.c 6b79bbd063dcbadca4cf617a
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c a3466128b52a86c466e47ac1a19e2174f7b5cf89
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c a83ed8bc2a31c131e3addb6f0488b68334085e7b
- F src/shell.c 85aae71dcc9bd6df28047b95ab631eb0ac91401f
- F src/sqlite.h.in 1af072be5ed8902c8c12b5b105487d0efedd00b4
+ F src/select.c f11533162b57ed5ed37f549add34cbcdf51f6712
 -F src/shell.c 38f627b0885191357f55902a3ac199de90d79715
 -F src/sqlite.h.in 159f2cb9eef74b6c99aeeb4c071e7745835f04f6
++F src/shell.c 801af09adf9bc64dea59b62880bfb72b42c5f5f2
++F src/sqlite.h.in 2d5eca136aeac3126da4fb3051bb000c6625047b
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 219f6e9323f7fdddaec9f442d9610cce356c3ad7
 -F src/sqliteInt.h 5a430c5443717d7c5e2c224f9dcc2534348dc3f6
++F src/sqliteInt.h c0e679f9be4081a88c734a357986fe6ffe2fcab7
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2e99ef7ef16187e17033d9398dc962ce22dab5cb
@@@ -305,15 -289,15 +305,15 @@@ F src/update.c b9e5295d3a78e96b7c2978c4
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 4006c01772bd8d8ac4306d523bbcee41d3e392d8
  F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
 -F src/vdbe.c 93eeb6f9c3a3084133225a196f220454d71cca10
 -F src/vdbe.h 09f5b4e3719fa454f252322b1cdab5cf1f361327
 -F src/vdbeInt.h 0b97a3190f8fbf460655985a9183019f5a702754
 -F src/vdbeapi.c e9e33b59834e3edc8790209765e069874c269d9d
 -F src/vdbeaux.c 5b687d7b5beaaa5b97189edf25cf08c311834933
 -F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
 -F src/vdbemem.c 1e105dacf5190fc85a8ec2107c0dcc1884e75099
 +F src/vdbe.c a96171a2d025cf3dfcea4f0d94232f4bfa192f34
 +F src/vdbe.h d61daeffed696e21630759de9e135ee298ad9573
- F src/vdbeInt.h 7d15127815d68e683d6a31bb4f7a52baa9cd67e5
++F src/vdbeInt.h 6d4bf3fd28699b5c81a68398e9d23720da58fcd8
 +F src/vdbeapi.c cdded67e36d2a20f6d1c7d56f008a646557d2bf0
- F src/vdbeaux.c 07b0045d0f34d0ad70c1c42ff75246a7e64e4e87
++F src/vdbeaux.c ea20bde8cad7b15198879255af849f105daa2fa0
 +F src/vdbeblob.c d65b01f439df63911ac3d7a9a85c15503965f2c3
 +F src/vdbemem.c 5096fe50a1bd12bc2294a8b27ca6e6d1b15ef607
  F src/vdbesort.c 5c1bacf90578d22b630fbf6ed98ccf60d83435ef
- F src/vdbetrace.c 4f29b04edb0cec3d5fcd9b566d9f0e75c8984362
+ F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
  F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
@@@ -1217,7 -1200,7 +1217,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 497367cb57345dd37793e5f369b34d12be56172e
- R cc11bbbd763a56bfdd0667ee0dcdded3
 -P b6b289182f6590288ebc7b9efbcb29b6b4480538
 -R cfd4c6e5c7836f29218c39baf2122e42
++P 1f44bfdc237ee6304f4aa56e5c5d1c0d74fcc944 5ce05757aac80b99c3b2141cd301809f8e28e661
++R 7b6778125f5d37e90ebb0b670b3bd514
  U drh
- Z 9e5912d3733f34c1f4a27e9b30386e30
 -Z 3bfcd52f8fd5ecba827fd0c1ccf2615c
++Z 7aa260299f51330d2234a568308a124e
diff --cc manifest.uuid
index 55c0eb0873,f78de65f58..1498f103ae
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1f44bfdc237ee6304f4aa56e5c5d1c0d74fcc944
 -5ce05757aac80b99c3b2141cd301809f8e28e661
++2695772c984c215649a16e1e3e18a8048a6a60dd