]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge the auto_vacuum bug fix and all other changes from the 3.19.3 release.
authordrh <drh@noemail.net>
Thu, 8 Jun 2017 14:41:05 +0000 (14:41 +0000)
committerdrh <drh@noemail.net>
Thu, 8 Jun 2017 14:41:05 +0000 (14:41 +0000)
FossilOrigin-Name: 93f32dd2dd572bd601215cc431318fd4da4bb897d8cf555d35d3b1ad60c4afe3

1  2 
manifest
manifest.uuid
src/btree.c

diff --cc manifest
index c92b423c16ba1f264722e51abcce56e5af492473,5b7be2b7f83627f3a4631643887b0640b6d0902b..5c6a41668a1348b8a15c02f95621ac89d79fe5e6
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\sall\sfixes\sfrom\sthe\s3.19.2\srelease.
- D 2017-05-25T17:36:33.543
 -C Version\s3.19.3
 -D 2017-06-08T14:26:16.283
 -F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
++C Merge\sthe\sauto_vacuum\sbug\sfix\sand\sall\sother\schanges\sfrom\sthe\s3.19.3\srelease.
++D 2017-06-08T14:41:05.866
 +F Makefile.in 227347646e289e3b016ebb7a391ad6ed4ab56525834d56d47d1a83b8d97d6989
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
 +F Makefile.msc fb28c0304f8a14c5ce7d4bde9fea1c903f644b49e78ebd9976ab2a1f0eb8afb5
  F README.md 2b15fae33852f2f53996774c21fb41e1d94181c4401a0e43ac93e11f2cc901b9
- F VERSION 10a1d396b8a19db3c3cc6c7b909be2cf7ad97c517b4f00af363506fd85aab713
+ F VERSION 6035ef7e627075d9a9194304c3a07acb2736a0abd0dd980a7ea75a3a45719e86
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -349,7 -346,7 +349,7 @@@ F src/auth.c 79f96c6f33bf0e5da8d1c282ce
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c 9d5f1346945b4d94715fb990e7243f583a3f174606d812fa179b14cdc72d0e86
 -F src/btree.c de57bf3f205082eb4ad8c923af7ecd1d10c4f15656f6a38038a3bd9b8ac3fc2a
++F src/btree.c 4f095b81d7ee908a08cdffe0bdc8ca52c802f3bf739209bb4a50b48745d473f6
  F src/btree.h 80f518c0788be6cec8d9f8e13bd8e380df299d2b5e4ac340dc887b0642647cfc
  F src/btreeInt.h a392d353104b4add58b4a59cb185f5d5693dde832c565b77d8d4c343ed98f610
  F src/build.c 4026a9c554b233e50c5e9ad46963e676cf54dd2306d952aa1eaa07a1bc9ce14f
@@@ -1585,7 -1580,10 +1585,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P bbd2d0e1400984c9fabb4df015981c09ad172139ffa33db5132951d4f1f6fc96 edb4e819b0c058c7d74d27ebd14cc5ceb2bad6a6144a486a970182b7afe3f8b9
- R 8f7f4a2a67f7b616427682df9786aa3e
 -P 97b5c4a53d0af3792c5ae5ceafdb02245f841c2bd4d79bcfd0ffdf6c5ff27c9e
 -R b94272eb5bee6b36b4ac20fd561bc415
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.19.3 *
++P 12964240f1e497e6f02e4a87bf3eff75c807020108c3de83977264cc66188b8d 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b
++R 3bf077ac2565718a31066a66ee1b255d
  U drh
- Z e4355aaf22b79f91f5965efabd280186
 -Z 0ee14e0381c757607413d6046358676f
++Z bfffc8e100f060437c630f2a98328854
diff --cc manifest.uuid
index 14c57052b7f02b43710d85d9426f51d1780042ca,fd64fbcbc19fbd6392a46c98897d475dde955805..a1c0d78046f598781a4d38e3fcca20b8b971d2e2
@@@ -1,1 -1,1 +1,1 @@@
- 12964240f1e497e6f02e4a87bf3eff75c807020108c3de83977264cc66188b8d
 -0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b
++93f32dd2dd572bd601215cc431318fd4da4bb897d8cf555d35d3b1ad60c4afe3
diff --cc src/btree.c
Simple merge