]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Bring the wal2 branch up to date with version 3.30.0
authordrh <drh@noemail.net>
Fri, 4 Oct 2019 16:15:45 +0000 (16:15 +0000)
committerdrh <drh@noemail.net>
Fri, 4 Oct 2019 16:15:45 +0000 (16:15 +0000)
FossilOrigin-Name: 16e1dced8b56ef422e5b747dd26accba5bf9f2df69b24b10363ef288890e21ee

1  2 
manifest
manifest.uuid
src/vdbe.c
test/permutations.test

diff --cc manifest
index 631ae1503e0dd2edcc3ccf519e85a6fd78eb98a0,44f902f667a0b21d7a06a5397fa00eb1ff6c1aec..33372b32cb34be0e21d544d4da4f7e74b0d6fc38
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\s3.30.0\sbeta\s1\schanges\sfrom\strunk.
- D 2019-09-30T16:44:00.186
 -C Version\s3.30.0
 -D 2019-10-04T15:03:17.190
++C Bring\sthe\swal2\sbranch\sup\sto\sdate\swith\sversion\s3.30.0
++D 2019-10-04T16:15:45.861
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -599,7 -597,7 +599,7 @@@ F src/upsert.c 710c91bb13e3c3fed5b6fe17
  F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
  F src/util.c fffdfa627be74d69ef425f92db124e7148af449bb8a3286e79577c42bca84061
  F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
- F src/vdbe.c 0e5124a3d01ce1e86b161f24b787715a4ccb2c126a936d10af22984850eebf9b
 -F src/vdbe.c 7f43ed8e055a4290535d2e4520d33f0ac6cc00ef76a0c099e4c6bd85be74a6b9
++F src/vdbe.c e72bbea7812aa9483fb9e09cfbcaaf77ee5b118ca5a2e98a9e2e46a77bf21de5
  F src/vdbe.h 3f2b571e702e77e6bf031f0236e554aedfae643e991f69000320f481408455cf
  F src/vdbeInt.h e95de5129124d77f01439e6635012adfaf23c0017bff47296126143cf18bd0c6
  F src/vdbeapi.c 95001d0f84ee3cda344fed98ca0d7961deb4fc836b83495630d0af1f7cc4789e
@@@ -1222,7 -1221,7 +1223,7 @@@ F test/parser1.test 6ccdf5e459a5dc4673d
  F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test 711f0aa9e8c89fcf97aaa2c0dac3f6d86b5085b1b9364008e78d9824c7fdbaf8
 -F test/permutations.test 8587800fe1a0eb01456a3f4500b821e54e3347e78acf11dbf05f4990530f6cee
++F test/permutations.test e92fe7c8eee860225761c275037740c306df12c70d1ff739096c60a5c5ac0ceb
  F test/pg_common.tcl 222a1bad1c41c308fa366313cd7b51b3be7e9b21c8736a421b974ac941693b54
  F test/pragma.test 59becdfd720b80d463ab750f69f7118fde10dfd556aa5d554f3bf6b7e5ea7533
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
@@@ -1857,7 -1846,10 +1858,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 da8bc974126729f1558f3c18118a32efcc5bdd9611533c34090f7e9e5176b4e6 661a3789eb329a2487855e49c31067a9dde4c91c1a3a65b65375d079f906b1da
- R 96511272cfe3d850d20a0a9d504eec31
 -P 7f9a4b6015ac332a04d3e394a6b3210fc95253d8786a261178a5639cb8d9d987
 -R f116075cb1c47b7928f41444f3803579
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.30.0 *
++P 918bd97d2946c0a403030fcf0eba596a742ada94b122bf0ac4b808097171056b c20a35336432025445f9f7e289d0cc3e4003fb17f45a4ce74c6269c407c6e09f
++R 91e58e4c42392d174fea53a7ebaa765a
  U drh
- Z 09f4d9cffa537d4b4777409f0f7b2e1d
 -Z edadfb0c72633ac9bcd13396063b6815
++Z 58d2e4880548cfcff6bf27ec6060bdee
diff --cc manifest.uuid
index 26d6107455e287d388d1db63a89fa5398c90dafa,59c1946757218ff7060bb5a46678c03119c1251f..25b09297c3f67f5abd86a386805359479b6bd3f3
@@@ -1,1 -1,1 +1,1 @@@
- 918bd97d2946c0a403030fcf0eba596a742ada94b122bf0ac4b808097171056b
 -c20a35336432025445f9f7e289d0cc3e4003fb17f45a4ce74c6269c407c6e09f
++16e1dced8b56ef422e5b747dd26accba5bf9f2df69b24b10363ef288890e21ee
diff --cc src/vdbe.c
Simple merge
Simple merge