]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge the 3.33.0 release into the reuse-schema branch.
authordrh <drh@noemail.net>
Fri, 14 Aug 2020 13:55:40 +0000 (13:55 +0000)
committerdrh <drh@noemail.net>
Fri, 14 Aug 2020 13:55:40 +0000 (13:55 +0000)
FossilOrigin-Name: e456d437083c550570063b874d685f110162a0551f51d5f190f90c1354e6e996

1  2 
manifest
manifest.uuid
src/alter.c
src/build.c
src/main.c
src/sqliteInt.h

diff --cc manifest
index 30327e0d5a1325ad61e1f31c0e37c1af63c48425,9122e4aaf4ec1de79e4eceaee27b911d3376cea8..813d942b1999701cea9fd825eb807ddaafca8485
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sall\schanges\ssince\sthe\s3.32.0\srelease\sinto\sthe\sreuse-schema\sbranch.
- D 2020-08-11T14:55:17.027
 -C Version\s3.33.0
 -D 2020-08-14T13:23:32.827
++C Merge\sthe\s3.33.0\srelease\sinto\sthe\sreuse-schema\sbranch.
++D 2020-08-14T13:55:40.839
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -470,9 -469,9 +470,9 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 485b411347f8566792f8023f83117da300ddaf263cb61027bd69ada015d2e300
 -F src/alter.c 805de23ddca536181f8f0439df989fdd4a2f76c40bc305ec9fe2f211f68c89e8
 -F src/analyze.c 5cffff3d355858cd22bfc6e20ac7203510d2e1cc935086eb06f4abb2f579f628
 -F src/attach.c 0b11e00c166b622c84ec176773b1d691c61ad07d247809e3e1635d4e99e71d30
++F src/alter.c 46f7f401f9bfce4b842d0ce14fb8bc74aa147ebaec7a9518c0719ed73ce0e5df
 +F src/analyze.c 5eab9cfb85d1280fa35fd4cf5c497f77ad884bf3658610e7321c3994e703c2e6
 +F src/attach.c f5e649fb70e856e2bc388d2f158cd4b4e43b85f43ad4c397fee192b35bd0dd57
  F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06
  F src/backup.c b1c90cd4110248c8e1273ff4578d3a84c0c34725e1b96dacd4a6294a908702de
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
@@@ -480,10 -479,10 +480,10 @@@ F src/btmutex.c 8acc2f464ee76324bf13310
  F src/btree.c 1439fd9b45d4d1883c53752daef42af489adaa1a1508fa39dedbc9c80ea21a2f
  F src/btree.h 7af72bbb4863c331c8f6753277ab40ee67d2a2125a63256d5c25489722ec162b
  F src/btreeInt.h 83166f6daeb91062b6ae9ee6247b3ad07e40eba58f3c05ba9e8dedad4ab1ea38
- F src/build.c 3b360c8171b401401fe6aae4c80759ab8c1a42fa5f45bb2ea73073bcd446bef8
 -F src/build.c dbdaee54ffef924a070eb6202017e10d6be56baab953ef0a8e714a6def683198
 -F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
++F src/build.c 4ed04b1ab10df9fe26a52d8355e910b158de088b67d4bb06e35cc5a4b44149e5
 +F src/callback.c d8cdf5d697a31cf54a2b64bce9001fe24f3522a566f44c9fe1eb3a0c7e291c56
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 -F src/ctime.c e98518d2d3d4029a13c805e07313fb60c877be56db76e90dd5f3af73085d0ce6
 +F src/ctime.c f5eaef0a5985fab6fc21e8b00aeaea1ca862a09c1ea5e505b0ad1da157eec247
  F src/date.c dace306a10d9b02ee553d454c8e1cf8d3c9b932e137738a6b15b90253a9bfc10
  F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
  F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c
@@@ -500,7 -499,7 +500,7 @@@ F src/in-operator.md 10cd8f4bcd225a3251
  F src/insert.c 957254a2d0542597455d0d4c640e4e3f3eea8c6d78f04582df03dfc626f07925
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 436af4968c6954d304fce9efa12719367bd8f37b19b93b71d6ad607e85adbb47
- F src/main.c 58a3980c13b994a90b70a9148bec4e103c17f3ac885791a789f776d37a958561
 -F src/main.c 09580279145f27f3db206ef44dcb3a8875a42644230f79c7e54aff35e71668f0
++F src/main.c 1c1924f4a9a8bbe2c3ab6adfe24b4fc36992e1f14b38b1c6bf93406d672c6177
  F src/malloc.c 22d5bdd9fe88ae4fad1b91a1b9735104b82853ffef868f1f05517d60dc1875f5
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -537,16 -536,16 +537,16 @@@ F src/random.c 80f5d666f23feb3e6665a6ce
  F src/resolve.c d74715aceed2a8f493ba244d535646fa93132042a4400a29dfd26ec841514048
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
  F src/select.c 510fdf819f218be3dac2683d3eaaf64e5080f548061a4dd12205590beda976bb
 -F src/shell.c.in b9b819feede7b85585ab0826490a352e04e2ee46e8132c92597d29972b2be1d7
 -F src/sqlite.h.in d2c03414a8ee5d4a6855c04dd7cd5998e45139b0fe66b65bae86d4223edd091f
 +F src/shell.c.in 0598d0e6d5489ddbfa8d6d54662bb43f0ac92679fe8d8ddf31fae6ffbc421f8b
 +F src/sqlite.h.in 7c1b9b3e42c6ed1670ef7dfd2df5ae95aaa966508c14ae5d060a9d14be9d99ae
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 2d1af80082edffd71c6f96f70ad1ce6a4fb46615ad10291fc77fe0dea9ff0197
- F src/sqliteInt.h 827cf0bf109871f5c6d343bf6ce160890fa60b639cc9b6dd1d0c06037f692d01
 -F src/sqliteInt.h a1aa5457ca881cbf5adb55933bf81d7d4889375afb9a0a5df382a451c058087d
++F src/sqliteInt.h 23e85f73cf4baacd70b20152fd55e8a2a311f87a1d82cf71befdbc5002540ef3
  F src/sqliteLimit.h 95cb8479ca459496d9c1c6a9f76b38aee12203a56ce1092fe13e50ae2454c032
 -F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
 +F src/status.c d0956e57c71160155f620a3efeb1e5c05a3f8b9a897dd09c5263268e5d237579
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c 986b6391f02cd9b53c1d688be55899f6ffddeb8e8014cd83c1b73ff912579a71
 +F src/tclsqlite.c f4dd32d001c2be33371dca87e30117352f02dad59a2e5428c97f08703360a169
- F src/test1.c 77d0bf0140d92e5e8234dd3e158a985fc905e5bd9d94254370d4e9421f7c2224
+ F src/test1.c 24b9cd0863ecc4d3920f4999c40e876c2bd92f3cc5879c48b99abe02c546ed18
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 7c4420e01c577b5c4add2cb03119743b1a357543d347773b9e717195ea967159
@@@ -619,9 -617,9 +619,9 @@@ F src/vdbemem.c 947f2a65910edb4014dc981
  F src/vdbesort.c 2be76d26998ce2b3324cdcc9f6443728e54b6c7677c553ad909c7d7cfab587df
  F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
 -F src/vtab.c 5f5fc793092f53bbdfde296c50f563fb7bda58cf48e9cf6a8bdfbc5abd409845
 +F src/vtab.c 54b6ab9f5ab772f56e9f3a95543207943e775ec699b7cbbfd3a99c264cad377f
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 7a05a519a02ffb7f2a458838a25853c7300c9e6d9ef546ee48469378ac0404f9
+ F src/wal.c 69e770e96fd56cc21608992bf2c6f1f3dc5cf2572d0495c6a643b06c3a679f14
  F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
  F src/walker.c 3df26a33dc4f54e8771600fb7fdebe1ece0896c2ad68c30ab40b017aa4395049
  F src/where.c 2ea911238674e9baaeddf105dddabed92692a01996073c4d4983f9a7efe481f9
@@@ -1889,7 -1879,10 +1889,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 ecf8dece0362b79d248bae1847d2224d18af395c336a604bbcf2b29ffab645d5 5bbd4bddd3b9fa64d134ed62bce3eb4a09456bf24dec2474b5d764a3a3775964
- R ee0b968df0e1e1dcb574e297557a3e7d
 -P b050976079ba4a22d4dfeadb81f40cf71da6588c95bf2b634d88b416de5accd7
 -R 799818c17104aa7af945cf9f5cad3762
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.33.0 *
++P b1a77b7eade14d58b3ccd50b98c2ffb6362d093f2cde2bd178ea62cef2cb8d9f fca8dc8b578f215a969cd899336378966156154710873e68b3d9ac5881b0ff3f
++R 7173e05c8edaab29ecbebe7d52a048d6
  U drh
- Z a71810780ea07fa9ef6e981886e896da
 -Z 652aa26f564c1138ae3a9226a8f034b3
++Z ce9d6fbce6c18933b2ac04a9b67cfbad
diff --cc manifest.uuid
index b44e3c40281b5b981f29004c7ca4c14c8a6cb674,4231aa8eafe78f7511cdee3185247f5fe786d4e5..b4e14f11e3db6e95e35cdae0d5dd159eb79c0416
@@@ -1,1 -1,1 +1,1 @@@
- b1a77b7eade14d58b3ccd50b98c2ffb6362d093f2cde2bd178ea62cef2cb8d9f
 -fca8dc8b578f215a969cd899336378966156154710873e68b3d9ac5881b0ff3f
++e456d437083c550570063b874d685f110162a0551f51d5f190f90c1354e6e996
diff --cc src/alter.c
Simple merge
diff --cc src/build.c
Simple merge
diff --cc src/main.c
Simple merge
diff --cc src/sqliteInt.h
Simple merge