]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Update this branch with latest changes from begin-concurrent-pnu.
authordan <Dan Kennedy>
Mon, 14 Jun 2021 14:01:25 +0000 (14:01 +0000)
committerdan <Dan Kennedy>
Mon, 14 Jun 2021 14:01:25 +0000 (14:01 +0000)
FossilOrigin-Name: a485d1a1b8a6a8255cd5177b6a8fa375e1b7281030170152819d5ee85b2b2334

1  2 
manifest
manifest.uuid
src/btree.c
src/main.c
src/sqlite.h.in
src/sqliteInt.h
src/vdbe.c
src/vdbeInt.h
src/vdbeapi.c
src/wherecode.c

diff --cc manifest
index cd0f9c16f2b96ad5a007aa6f807c146b5ef6d047,fae5e0fda3e1e71c56d96eaae0c970cf737dc791..20bf43c1cda252f31025dfafc5372cb4887d0f5c
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sbegin-concurrent-report\sbranch\svia\sthe\nbegin-concurrent-pnu\sbranch.
- D 2021-05-21T16:32:15.249
 -C Update\sthis\sbranch\swith\slatest\schanges\sfrom\strunk.
 -D 2021-06-14T13:49:11.453
++C Update\sthis\sbranch\swith\slatest\schanges\sfrom\sbegin-concurrent-pnu.
++D 2021-06-14T14:01:25.950
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -487,13 -487,13 +488,13 @@@ F src/alter.c da02319df16f58f4a86c1b4a7
  F src/analyze.c 01c6c6765cb4d40b473b71d85535093730770bb186f2f473abac25f07fcdee5c
  F src/attach.c a514e81758ba7b3a3a0501faf70af6cfc509de8810235db726cfc9f25165e929
  F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
 -F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 -F src/bitvec.c 8433d9e98dd6f2ea3286e0d2fe5d65de1bfc18a706486eb2026b01be066b5806
 +F src/backup.c 0d3f5004d5c85f257add00aee97687d40790a471a5d56306043ed9a7b53d6994
 +F src/bitvec.c a012cfe503cddd1df1a75c139baf4586acc32f25c66f79039caf1d06474434f2
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c 2796e765c14282a0f73ad5a050f9fa69c067cf0ac1d77950e10ca1fd26ef80ea
 -F src/btree.c cebbb6e1a01b46e9f5fad81feb7ea7ca0581737fd866d7b07d6039dc4f00f400
 -F src/btree.h ccdc64bd1eee7ba79d4c0b2af22b6df1e5ededdbf9606f45f4fca4738dd6fa0b
 -F src/btreeInt.h 1e9f10107a4ec5d2940ae5b859242ae83b81402986724bed08b8491a5ea64a4d
++F src/btree.c 183bb926c8b9be6b6099612f50cc0735e8d4300ea58e08617592210a78101107
 +F src/btree.h 888d9cea384478728e1e475e1660bd4138e3ec635f1b430e3f57e88d9c81d2fe
 +F src/btreeInt.h b8c4dee39e4cbe127a6cf479f32e345e186db63923e937b5f42807c76bfd8e9d
- F src/build.c 3a6da77c49a36ad578e9d534597e649256a5bd5c12676a17d837cfc1a381948a
+ F src/build.c 7f4bc67cdf0b35126239f5844ea03ddccb857c04abef9018913a2f6edf60d119
  F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 3052b6b05ed9ef547a3dd66b8e01bfa9d582e78752ad6ed327da84652641e038
@@@ -510,11 -510,11 +511,11 @@@ F src/hash.c 8d7dda241d0ebdafb6ffdeda31
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 -F src/insert.c 2189e0e596010a0dc5405d9f14f78db1ee2fa71138c931f5b6ea96610b95bfc1
 +F src/insert.c 7c7ef7b00c58443b5a3832eb4a963377fa9216682d992d5bc96310fb00625496
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
- F src/loadext.c 8c9c8cd2bd8eecdb06d9b6e89de7e9e65bae45cc8fc33609cc74023a5c296067
- F src/main.c 11ef55f5f32ac56319f86d758466bf9451500f457cf10802b26de400757371f1
- F src/malloc.c c1af4ac5a463648cd2953fd4ac679b3ba9022ce5ec794a60806150ad69dfd33a
+ F src/loadext.c 12684b3f19cd103cea97cdf14d0758196d0c646e12a898d7245141a9abfde9a4
 -F src/main.c 26ecd5ee511a179909fcc99b511aa80b541c9a96aaf0ef772a03483cbd58f185
++F src/main.c 1989d087d08f267eddab38db6b8a302717c50e597ff0f9adc29dadef03097970
+ F src/malloc.c cbc93cdd429c4594912017d92ab656e2579aca64dbd1c6888551275bed46f25b
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
  F src/mem2.c b93b8762ab999a29ae7751532dadf0a1ac78040308a5fb1d17fcc365171d67eb
@@@ -536,25 -536,25 +537,25 @@@ F src/os_setup.h 0dbaea40a7d36bf311613d
  F src/os_unix.c ff4738e222bbbc2ecc396398c8ba1ae757bee03b782a8dd8bc8a5d39128e52d1
  F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 12b7e6f061247cc7e24d81dddd0161ba9e317ef3c3b93f0a299873746a07d989
 -F src/pager.h fdc30693c403aa9b4293d0b126346db7e450f8f0e5d2c1bb8355acb1cb8da6fd
 +F src/pager.c 8302eb7aab26c8f0120c714d5f0505ba41140790b76fc62ff8163ca00b7122d7
 +F src/pager.h ed1f7bc91ceae75fa918d51f7c2ad071a5458cc3dc0085ca7577f8d51bf2d7cb
- F src/parse.y 68f3bdc6ab07f5660944cde812318eab6007416fd1ea008422a96f1675c75ff2
+ F src/parse.y a52d0c9a7485121232ecbfcd2086e9f9ddf12449c9fa38fda9be4932e402e3c3
  F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 388304fd2d91c39591080b5e0f3c62cfba87db20370e7e0554062bfb29740e9f
  F src/pragma.c eb42cb9bec189cf18cef5d8fcae56e13bb73ef2b019b198fb48740ced81bce95
  F src/pragma.h b93fd693bd38cefeaf8e2c7e8c929717f7799a9770104cdd2bae8df2a84e2da7
- F src/prepare.c d778af9986f3b0107c5b255dcfe2696e8e99e00fb77c5115bbfea4e92c3302e7
+ F src/prepare.c 0d53d20532aada295c1690792a125adbd6435f5ce703ff0adf1b9b3605238b67
  F src/printf.c 78fabb49b9ac9a12dd1c89d744abdc9b67fd3205e62967e158f78b965a29ec4b
  F src/random.c f27af4099afaea7284ade5c206224dcfdb2334cfd119d018b470d46356b3f27d
- F src/resolve.c 40e216d9a72e52841a9c8e0aec7d367bade8e2df17b804653b539b20c1ab5660
+ F src/resolve.c 35630effd4d16d2373caa41bae40a3d71f853f3ad0cb4f572f2ed4b8c350c1e9
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 52ed98f39e1629ccf568b372f29b376ca6007158a46cdd956dbdcf8cab05fc89
- F src/shell.c.in 1b32ba2918ede13b68df47c7b92b72ba0d06e68d384e78bb9d7456527271d400
- F src/sqlite.h.in 3cb1a5e743b9dedd528af37562a55e34f56bd46c332fca91959e6abced32e0b0
+ F src/select.c c586ad02fe8813acf907f5cab181993839ba2fbfc87ac72392d1605401cb6203
+ F src/shell.c.in 586493be0d3a2fc1e6803577d683697dfefc0fb305cc966bb389ce4045cbc19d
 -F src/sqlite.h.in 31e664dde4af28891280ff51a1f38f647c2d9e89f3616a22c66f25407a16f569
++F src/sqlite.h.in 38d1b16b820d6323b6509099ac80211ff0c87c3e05ef39f18621100f9a646182
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
- F src/sqliteInt.h 81408a969ee8d6efac8d24bcb32f61fcabfdd246b03938184fc573ed0ca6873f
 -F src/sqliteInt.h 336e807302ed31cf79c27539c3bc56c9129c10e40f8e23e35625bc2eb9eaf7fa
++F src/sqliteInt.h 31376e9d1e53dcb27f11188116d63a623447e379ba2843b7083ca854e90e9ffe
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -621,13 -621,13 +622,13 @@@ F src/upsert.c df8f1727d62b5987c4fd302c
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 41c7a72da1df47864faa378a1c720b38adb288c6838cb6be5594511b6287a048
  F src/vacuum.c 9d6ac090ff36d80f0a2c5bfc63994b714c464bfc44efa5056c457a6a4163dc99
- F src/vdbe.c 409213701d5001e854c2c22f5c12295fc94ffe40e105a7ce464f4cd1a06eade4
 -F src/vdbe.c 6a7ca429e7d385204ac159ec0454b209005e12ca845c69cb3ae45d027f88362c
++F src/vdbe.c 9e932e19be0c61db591bd4f35242c6ccf3f72e31ac83a865f43a438b8ea687e5
  F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
- F src/vdbeInt.h ffdda10e25c4da582a7e1cb1af37d4be9d9dd181c55ea95c61cc8bdc3c250647
- F src/vdbeapi.c 3f32ddfcdd548a98ccf11647fd2d95b790cfb34cbd20450297e387cd4de3749d
 -F src/vdbeInt.h 465fcb494db4ca6630fb9c19b2f3dfed597fbe885b0d4204193a5093b0dd7dc6
 -F src/vdbeapi.c aa5aaf2c37676b83af5724c6cd8207a3064ed46a217fd180957f75ac84f7a2a5
++F src/vdbeInt.h 2678f1f42643fac4a285fac998ceacd346863bba40fb221bd072a4e979c573db
++F src/vdbeapi.c af2e512c90e751a4617252d162ad2c56978bd6a6e77ebb269899e1c4333dee59
  F src/vdbeaux.c 708f3479a4b1f895f654e29b4fa597ee4c2927ecde3a27ed07dda964a3a12b3a
  F src/vdbeblob.c c6b8db50b227f66fb404215732068df76485b5b433e5f9d4d9ac27410b218193
- F src/vdbemem.c 175c73ced03edbb0f6567a41c8032afaeb83372090fa7bddfc88a67e28da2b8a
+ F src/vdbemem.c 53881aa0a7845922a075b3f375695588618098871a7a4120af4c297b80fa3e64
  F src/vdbesort.c f5b5e473a7cee44e47a94817b042fd7172cf3aa2c0a7928a8339d612bcfdec5a
  F src/vdbetrace.c 666c6fd9f1b62be6999e072a45b913e3c2c3518bc60dfd4d54fe304130acb724
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
@@@ -636,11 -636,11 +637,11 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 59ad6d70c32f6e52d9695b081a429b5c2ed76b116bee5dcfed88d3e78148164a
  F src/wal.h 7ffe787437f20a098af347011967a6d3bb8e5c3dc645e6be59eff44d2b2c5297
  F src/walker.c 7342becedf3f8a26f9817f08436bdf8b56ad69af83705f6b9320a0ad3092c2ac
- F src/where.c 32f41c3c93c6785e0077e3a2cdc669c3ccfe70173787847be77f294c18fc7dc3
+ F src/where.c dc062832c30aa6c5f17805c1235b2b621cd9db506412d5d3ef0799d26ae3396f
  F src/whereInt.h 9248161dd004f625ce5d3841ca9b99fed3fc8d61522cf76340fc5217dbe1375b
- F src/wherecode.c d4dded15e9b105dc6d6ade682e89463f2637d45135139058aadfaa9436de6fde
 -F src/wherecode.c 9f1f65d11437b25cd0a1497a170514c785f19ce6ad9d3e6fc73719cb5a49012f
++F src/wherecode.c 116a1964eda2d6489186d7a2de8c34e38a868c488dfb987c1e4d3a9ee3a2f233
  F src/whereexpr.c 5a9c9f5d2dac4bcdcaae3035034b4667523f731df228e0bb1d4efc669efa9da5
- F src/window.c ce5e73ab88a8527d268673906bf89cbe58c61bca8d54d38ed8c33c3220a276ee
+ F src/window.c a6d624d83b2d5b3cfb82bb437a2fbae759c928d47dc9ad1338a9419269181bb2
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
  F test/affinity3.test eecb0dabee4b7765a8465439d5e99429279ffba23ca74a7eae270a452799f9e7
@@@ -1932,7 -1934,7 +1936,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 655c28412fcbd3d39c8b4f1167229f28bc01a22b08c172fadddef0a4247d501f a8d05f8e92b13bb5c150c1e3e7cf861d15bc7d50149ebb83646a2376cbfbd52b
- R cfd252e42cd99e4e94680145c5f75dc6
- U drh
- Z 1ea5827baf41d9bb6a5061b0098597da
 -P a8d05f8e92b13bb5c150c1e3e7cf861d15bc7d50149ebb83646a2376cbfbd52b 7068f1f69b4feef49260e80902e6bdae47c21a0daa16c96ed1a0984dd1f14cdc
 -R 1edd9dd452226370d55f7dda19b0bf4f
++P 1dc6cf51138bd16c1e291f3ddb0fa00fd35fbb087de54e0b4c4afd5dd52da62c 74b42754d075a91e8f7d9067a3fcd5c60af03b520984fb3f8bb0c51faa376857
++R a8e75f3ad6448a5a493cbf3278b1e727
+ U dan
 -Z 4290566281884dcafb7f03164e6011c4
++Z 0c18bed414912783ac1fa2f2454355b7
diff --cc manifest.uuid
index 42e455ab7a68d013775621e2c4728c3042ff919d,51171b2cef95ffa23fc1dae810a548f65cdf19d8..d862503391caf0bcbcf5927a27e7557e35f129ed
@@@ -1,1 -1,1 +1,1 @@@
- 1dc6cf51138bd16c1e291f3ddb0fa00fd35fbb087de54e0b4c4afd5dd52da62c
 -74b42754d075a91e8f7d9067a3fcd5c60af03b520984fb3f8bb0c51faa376857
++a485d1a1b8a6a8255cd5177b6a8fa375e1b7281030170152819d5ee85b2b2334
diff --cc src/btree.c
Simple merge
diff --cc src/main.c
Simple merge
diff --cc src/sqlite.h.in
Simple merge
diff --cc src/sqliteInt.h
Simple merge
diff --cc src/vdbe.c
Simple merge
diff --cc src/vdbeInt.h
Simple merge
diff --cc src/vdbeapi.c
Simple merge
diff --cc src/wherecode.c
Simple merge