From: drh <drh@noemail.net>
Date: Thu, 21 Aug 2014 16:09:36 +0000 (+0000)
Subject: Merge all recent trunk changes, especially the fix for
X-Git-Tag: version-3.13.0~148^2~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2571e4eddd05dceb9c707e8356153d0836d84228;p=thirdparty%2Fsqlite.git

Merge all recent trunk changes, especially the fix for
ticket [369d57fb8e5ccdff06f1], but also the skip-scan improvement and
performance improvements in the b-tree code.

FossilOrigin-Name: 0b9e2c3269695713b538561d999c68097db70f0c
---

2571e4eddd05dceb9c707e8356153d0836d84228
diff --cc manifest
index 05bbcc7219,1e5132fbcf..f47a3f4e0f
--- a/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Disable\sthe\shook-7.5.2\stests\swhen\susing\ssessions,\ssince\sthat\sare\snot\scorrect\nin\sthat\scase.
- D 2014-08-19T00:33:22.234
 -C Fix\sa\sfaulty\sassert()\sstatement.\s\sAdd\scomments\sto\sclarify\sthe\sbehavior\sof\nthe\ssqlite3OpenTableAndIndices()\sroutine\sin\sinsert.c.\s\sAdd\stest\scases\sto\nverify\sthat\sthe\sassert()\sstatement\sis\snot\sfiring\sinappropriately.\nTicket\s[369d57fb8e5ccdff06f1].
 -D 2014-08-21T14:10:23.770
++C Merge\sall\srecent\strunk\schanges,\sespecially\sthe\sfix\sfor\nticket\s[369d57fb8e5ccdff06f1],\sbut\salso\sthe\sskip-scan\simprovement\sand\nperformance\simprovements\sin\sthe\sb-tree\scode.
++D 2014-08-21T16:09:36.975
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in d5ad373b7a23525414b8843b3084cf90c560d92f
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
 +F Makefile.msc f1bbf555916b6e60887d86cea62f27e6a26cdb24
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
- F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
+ F VERSION 53a0b870e7f16d3b06623c31d233a304c163a6af
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -191,7 -176,7 +192,7 @@@ F src/callback.c fcff28cf0df2403dd2f313
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
  F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
- F src/delete.c 50b74c1dde25d1ebcb4fa5c870762e6470ee46f1
 -F src/delete.c 5adcd322c6b08fc25d215d780ca62cebce66304d
++F src/delete.c cb7a757eb829ebb046c66f6399435c6636fe1314
  F src/expr.c f749009cf4a8534efb5e0d5cd7c9fb1fb0f2836c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 8545f3b36da47473e10800ea4fb0810fd4062514
@@@ -200,7 -185,7 +201,7 @@@ F src/global.c 1e4bd956dc2f608f87d2a929
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c b1f57e168d39fed8a0d3d891bf38091b104dd707
 -F src/insert.c d1a104e67b33314d4cc5c1356147446086ab9fc8
++F src/insert.c 3d41db1398a5863c4a1c064d2082d0dc43274628
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c febc2a9e7ad6c1a6191c7b5b9170b325d263f343
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
@@@ -239,15 -224,15 +240,15 @@@ F src/random.c d10c1f85b6709ca97278428f
  F src/resolve.c 0ea356d32a5e884add23d1b9b4e8736681dd5697
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
  F src/select.c ea48e891406ccdf748f3eb02893e056d134a0fea
- F src/shell.c 220564b70a2115e2157688f8faa6bb751ffe019a
 -F src/shell.c 728d2226594d356bf4fbdbdfd08538fd78fd06f3
 -F src/sqlite.h.in ed9d35990c61f0388ca6405706455c4095310553
++F src/shell.c 34be9dc9e7b96081488acebecae6cd92632397a6
 +F src/sqlite.h.in 021a1f5c50e83060675d994a6014fd409e611d9e
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h 641f8fbb65ca2084c8df95b525f6f82c7a1e91ae
 +F src/sqliteInt.h d60dbbadfd64374a5a2f362fc6f45899540c2c8e
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 7ada527ce7916adcabad7997c10f09680aac7c9b
 -F src/tclsqlite.c 7d100e2e7aad614bb3d7026a41a0e3827dbaaebc
++F src/tclsqlite.c 30d8f4ba516061832cfe10d7c71d84e17bff1918
  F src/test1.c 14409a611e9c27c6c522c610bbff5561f05c1558
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
@@@ -299,12 -284,12 +300,12 @@@ F src/update.c b0f38fda25d532343d54b7dc
  F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
  F src/util.c 3076bdd51cdbf60a6e2e57fada745be37133c73e
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
 -F src/vdbe.c f7f4066e4d6e3858878d76ce9288ea603e12ddf6
 -F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
 -F src/vdbeInt.h f5513f2b5ac1e2c5128996c7ea23add256a301df
 -F src/vdbeapi.c 7858d7e7cd23267d3fbca18e3a28cce8e0d162a8
 -F src/vdbeaux.c 25d62ef82cf1be2a1255eacac636fa0d943d8b3d
 -F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
 +F src/vdbe.c ff9bec31cc128e98d852ebee6e5d4e160846e0c5
 +F src/vdbe.h ca3b6df299adce6e2f499c57e42ae54f142ae823
 +F src/vdbeInt.h 5eee1752eff410de9373196e2b327f7deefb3920
- F src/vdbeapi.c 52335de5ff97bba93d6779d8df87feab5d53d7df
++F src/vdbeapi.c 11d97cd50ca78f6c6ce796d0c78913ef27f5383d
 +F src/vdbeaux.c 22aabbdea2394cea26e35b2190fa9111e4bc18c2
 +F src/vdbeblob.c d7c232d1c6afc7ee1176c38b7d81b2e17af15ceb
  F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
  F src/vdbesort.c f7f5563bf7d4695ca8f3203f3bf9de96d04ed0b3
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
@@@ -1203,7 -1188,7 +1205,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 b69f7dd1f35846c3bb9f4f160d50c4f03796f887
- R 8c550f2382b76c35956caff857ef2faa
 -P 91594aae0725388765070c80039dfe1bf126392d
 -R 25e887863ed8cfd2c8a241fac46385f1
++P 6d5b9332e8d8bb572ac98b0f4e47e59ad12aac26 7029b3404d3f5f698a496934f3a3f2972051b257
++R a953db417f3d0f990497f5e1512b276c
  U drh
- Z 2eb508c95168b21e7a389265ba7bb22f
 -Z ed55b6e966354470a11e6c95fe10b90c
++Z d706f9a9d70b2e75b205ef1091dd3b5f
diff --cc manifest.uuid
index 795c3d44c4,944f894bbc..523d250c73
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6d5b9332e8d8bb572ac98b0f4e47e59ad12aac26
 -7029b3404d3f5f698a496934f3a3f2972051b257
++0b9e2c3269695713b538561d999c68097db70f0c