From: drh <drh@noemail.net>
Date: Wed, 13 Aug 2014 14:43:32 +0000 (+0000)
Subject: Merge the trunk changes for 3.8.6 beta3 into the sessions branch.
X-Git-Tag: version-3.13.0~148^2~131
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0738004cac55100950abcba372bdccecbb1267c;p=thirdparty%2Fsqlite.git

Merge the trunk changes for 3.8.6 beta3 into the sessions branch.

FossilOrigin-Name: d49455d9a972fc2224d9beb97165a998ca56e838
---

d0738004cac55100950abcba372bdccecbb1267c
diff --cc manifest
index 8ab42e0c9a,2718e0bc1a..c3a760a83f
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\ssecond\sInterlockedCompareExchange()\sfix\sfrom\strunk.
- D 2014-08-06T12:00:08.042
 -C Minor\schange\sto\sunixDelete\sfor\sVxWorks\swith\sa\sDOS\sfilesystem.
 -D 2014-08-13T11:39:42.875
++C Merge\sthe\strunk\schanges\sfor\s3.8.6\sbeta3\sinto\sthe\ssessions\sbranch.
++D 2014-08-13T14:43:32.382
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in 639859a6f81bd15921ccd56ddbd6dfd335278377
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
 +F Makefile.msc d389ce1d436d21a93a9f5f6211dc45e4b8860962
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
@@@ -198,12 -184,12 +198,12 @@@ F src/global.c 1e4bd956dc2f608f87d2a929
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
 -F src/insert.c 991e4964e9295da3993e2c0f81c7faf642371848
 +F src/insert.c b1f57e168d39fed8a0d3d891bf38091b104dd707
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
- F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
+ F src/legacy.c febc2a9e7ad6c1a6191c7b5b9170b325d263f343
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c bc02756952d81d9ef8c7ce544ebc9f794c498f5e
 -F src/main.c 1cf92c5c6468f2b6ed99b638706781ccc9c60b42
++F src/main.c 7f8200240d0ca790804b04deeca9f2461013355e
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -234,14 -220,14 +234,14 @@@ F src/pragma.c d10ef67c4de79f78188b965b
  F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337
  F src/printf.c af06f66927919730f03479fed6ae9854f73419f4
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
- F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
+ F src/resolve.c 0ea356d32a5e884add23d1b9b4e8736681dd5697
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
- F src/select.c 1529c49075464c5a95fde77314073612b1b8d595
- F src/shell.c 191129c3f7a9cf241aea90ff6a6be3e74d3767f0
- F src/sqlite.h.in 6b18f91758d1816f8cc2596d7a2c89c9db348ff5
+ F src/select.c ea48e891406ccdf748f3eb02893e056d134a0fea
+ F src/shell.c 75bb7bd2c80bb44861598f322a417c4bafe98fd7
 -F src/sqlite.h.in ed9d35990c61f0388ca6405706455c4095310553
++F src/sqlite.h.in 021a1f5c50e83060675d994a6014fd409e611d9e
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  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
@@@ -297,12 -283,12 +297,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 54fa84fdd992886dcb1a4c0cec2ae686d2d18b2b
 -F src/vdbe.c cd8d7e3ecd3e0e0684f6bf48469966335c666883
 -F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
 -F src/vdbeInt.h f5513f2b5ac1e2c5128996c7ea23add256a301df
 -F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
 -F src/vdbeaux.c 25d62ef82cf1be2a1255eacac636fa0d943d8b3d
 -F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
++F src/vdbe.c b23574edc8ccda95f1b00e263a6c82927fbcdccf
 +F src/vdbe.h ca3b6df299adce6e2f499c57e42ae54f142ae823
 +F src/vdbeInt.h 5eee1752eff410de9373196e2b327f7deefb3920
 +F src/vdbeapi.c 52335de5ff97bba93d6779d8df87feab5d53d7df
- F src/vdbeaux.c c034933f1d417e333d07b63e5a4623cbaeccb361
++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
@@@ -1200,7 -1186,7 +1201,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 7a145c9409e70b92946534eb44c2e205f7309897 5c6bb57d90bad32785d6d9cdf110a825bbc5ec73
- R f7c4de536b9a92bc8dd6b703c04d01eb
 -P d46adf9d8f741838b9c30f915231d6a3986c3591
 -R 0bcddbf637a1ae28dd56c0df43bdd1a6
++P 69018967f6e38521dd9b0fa9ce05c9b947635335 f01d42cc8b00d2b7c4f14defcb05fdc493cf1bfd
++R bd5030744f9ce407da63815c443bb97c
  U drh
- Z cae7acdddd6dd26c0313d812b71090a2
 -Z a0023172094bb1f589643de5ae500c6e
++Z eeb6d5c5bf1539cd0d4aa93b68a7c80f
diff --cc manifest.uuid
index 5d0b8910d9,12fc1aa48f..c9527d21cb
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 69018967f6e38521dd9b0fa9ce05c9b947635335
 -f01d42cc8b00d2b7c4f14defcb05fdc493cf1bfd
++d49455d9a972fc2224d9beb97165a998ca56e838