]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Update the sessions branch for version 3.8.6.
authordrh <drh@noemail.net>
Fri, 15 Aug 2014 15:10:46 +0000 (15:10 +0000)
committerdrh <drh@noemail.net>
Fri, 15 Aug 2014 15:10:46 +0000 (15:10 +0000)
FossilOrigin-Name: 2acbeac1fd9b9feb26e1c24d4ae50ce79f17a3f8

1  2 
manifest
manifest.uuid
src/vdbe.c

diff --cc manifest
index c3a760a83fcdb8abf3ba0b1a422b21c98aff2da0,28b547a053417e65fcf3d835c4059b3c222dff94..b52178bb6717823ba585089e36012bdc3fdd498a
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\strunk\schanges\sfor\s3.8.6\sbeta3\sinto\sthe\ssessions\sbranch.
- D 2014-08-13T14:43:32.382
 -C Version\s3.8.6
 -D 2014-08-15T11:46:33.931
++C Update\sthe\ssessions\sbranch\sfor\sversion\s3.8.6.
++D 2014-08-15T15:10:46.167
  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
@@@ -238,10 -224,10 +238,10 @@@ F src/resolve.c 0ea356d32a5e884add23d1b
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
  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/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
@@@ -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 b23574edc8ccda95f1b00e263a6c82927fbcdccf
 -F src/vdbe.c f7f4066e4d6e3858878d76ce9288ea603e12ddf6
 -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 ff9bec31cc128e98d852ebee6e5d4e160846e0c5
 +F src/vdbe.h ca3b6df299adce6e2f499c57e42ae54f142ae823
 +F src/vdbeInt.h 5eee1752eff410de9373196e2b327f7deefb3920
 +F src/vdbeapi.c 52335de5ff97bba93d6779d8df87feab5d53d7df
 +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
@@@ -1201,7 -1186,10 +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 69018967f6e38521dd9b0fa9ce05c9b947635335 f01d42cc8b00d2b7c4f14defcb05fdc493cf1bfd
- R bd5030744f9ce407da63815c443bb97c
 -P 3f45b8192dad7fb1f027cbaa694046e3c1b3e278
 -R be8bb3bca247e348b90f7388fee24972
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.8.6 *
++P d49455d9a972fc2224d9beb97165a998ca56e838 9491ba7d738528f168657adb43a198238abde19e
++R f94212c9f19d7229cfd6e84a8137e8b7
  U drh
- Z eeb6d5c5bf1539cd0d4aa93b68a7c80f
 -Z 74d8dd4d4aac0ae87245b4bcefd8b172
++Z 80e27e19ffdd26307df7b50bec8606de
diff --cc manifest.uuid
index c9527d21cb50d1cbd216d4725d5a204dc6dc799b,01b81a48046e2943e3f29cbbf851b53cabdfff68..79ed17684cdce545e251151bfcbd2e459771868d
@@@ -1,1 -1,1 +1,1 @@@
- d49455d9a972fc2224d9beb97165a998ca56e838
 -9491ba7d738528f168657adb43a198238abde19e
++2acbeac1fd9b9feb26e1c24d4ae50ce79f17a3f8
diff --cc src/vdbe.c
Simple merge