]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge 3.44.2 changes into the bedrock-3.44 sub-branch. bedrock-3.44
authordrh <>
Fri, 24 Nov 2023 12:42:10 +0000 (12:42 +0000)
committerdrh <>
Fri, 24 Nov 2023 12:42:10 +0000 (12:42 +0000)
FossilOrigin-Name: 1d9dfad077a8c3549b82d7813ad9bfbe3d8ef97a0b69b87612771c73810aeaf3

1  2 
manifest
manifest.uuid
src/select.c
src/vdbe.c
src/vdbeaux.c

diff --cc manifest
index eabbb54a31ce4067aa35ce75cdf0baa1be107780,81c21196627c81a7ae94d9101151de5adeb7ea5f..bce9bd1529324d48433c8d13b6b045cfc82897e2
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\sversion\s3.44.1\spatch\sinto\sa\snew\ssub-branch\sof\sbedrock.
- D 2023-11-22T16:15:22.701
 -C Merge\s3.44.2\schanges\sinto\sthe\swal2-3.44\ssub-branch.
 -D 2023-11-24T12:38:54.644
++C Merge\s3.44.2\schanges\sinto\sthe\sbedrock-3.44\ssub-branch.
++D 2023-11-24T12:42:10.202
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -98,8 -97,8 +98,8 @@@ F ext/fts5/fts5_buffer.c 3001fbabb585d6
  F ext/fts5/fts5_config.c 054359543566cbff1ba65a188330660a5457299513ac71c53b3a07d934c7b081
  F ext/fts5/fts5_expr.c bd3b81ce669c4104e34ffe66570af1999a317b142c15fccb112de9fb0caa57a6
  F ext/fts5/fts5_hash.c 076058f93327051952a752dc765df1acfe783eb11b419b30652aa1fc1f987902
- F ext/fts5/fts5_index.c 809407c520c6afc3c1a0b8080cbd9080e4d84442f52a31654cc0e3d3acccea17
+ F ext/fts5/fts5_index.c 458cbed8a3e17617cbf7e80cdfb7612000b9bb3781f286b345fb9655858658cf
 -F ext/fts5/fts5_main.c a07ed863b8bd9e6fefb62db2fd40a3518eb30a5f7dcfda5be915dd2db45efa2f
 +F ext/fts5/fts5_main.c ceffea70ce673fbe904099b6fccdcbd92ab5e8530502805e8576bb04de4948fc
  F ext/fts5/fts5_storage.c 5d10b9bdcce5b90656cad13c7d12ad4148677d4b9e3fca0481fca56d6601426d
  F ext/fts5/fts5_tcl.c b1445cbe69908c411df8084a10b2485500ac70a9c747cdc8cda175a3da59d8ae
  F ext/fts5/fts5_test_mi.c 08c11ec968148d4cb4119d96d819f8c1f329812c568bac3684f5464be177d3ee
@@@ -715,28 -710,28 +716,28 @@@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b
  F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
  F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
  F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
 -F src/os_unix.c cb116fde9e3ca3c1bbfdf89d6928f776a2a34da168e2667426523a4db353b271
 +F src/os_unix.c c699536c351e299373d44e384c39ad2ff5191e113fd5b08ab8157094ca7e7626
  F src/os_win.c 4a50a154aeebc66a1f8fb79c1ff6dd5fe3d005556533361e0d460d41cb6a45a8
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 3f41b76db0cf601f05ab4df508a9f19b90ad50fc5031a5f41fb8f23b16ed9429
 -F src/pager.h 1da654b51a4a002e6d8bf68fbdb454e1f31ebe43cc4d399a4dfb8da4ad2fe182
 -F src/parse.y 020d80386eb216ec9520549106353c517d2bbc89be28752ffdca649a9eaf56ec
 +F src/pager.c f6343cfe1fe5760d69bdb36611927377b4bb2c1914ac4eab5f2e8dcf6e8d44e5
 +F src/pager.h 314eb19f250d6ce31bdc32255a47141125f9b7c13cc202da2995eed5ef3c9825
 +F src/parse.y e583113148bb13280de7faab4f213fa183d9e6498483d5eee02f9578a07b9cd4
  F src/pcache.c 040b165f30622a21b7a9a77c6f2e4877a32fb7f22d4c7f0d2a6fa6833a156a75
  F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 -F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00
 +F src/pcache1.c 181baf62714c20e41c77655360bd4179661f519ecd952314cdeacf60460a1878
  F src/pragma.c 087234c661e4f09e0cc53ae29ed59ed2e555d49c0dd12d913665a6bcf5ab9e1b
 -F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 +F src/pragma.h 6ebbdee90ed56a892d2c728e27fd9c1ce48c8a28841888d0c6c147946b38cb25
  F src/prepare.c bde74add20fc0e8ce0c4e937a1f70a36d17413afe4f71d3e103f5cb74b17c8d9
  F src/printf.c 9da63b9ae1c14789bcae12840f5d800fd9302500cd2d62733fac77f0041b4750
 -F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 +F src/random.c 9bd018738ec450bf35d28050b4b33fa9a6eebf3aaefb1a1cff42dc14a7725673
  F src/resolve.c 31229276a8eb5b5de1428cd2d80f6f1cf8ffc5248be25e47cf575df12f1b8f23
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
- F src/select.c 445aa9b5a7462cb4e34c7fed3ff20931f638323f28e6374e14b22c07cdca2de3
 -F src/select.c 85857bedd2913d888aa571755b48c54cd2e6e7fcb0087e19b226ee0368cfda1e
++F src/select.c f20b10969eb9e5726d457a98eeb7176768c36bd68fd3fc20ab426da2c8788142
  F src/shell.c.in cbe850737d4166347bfe5fc7d695229379347509bf114cf6abeb1e384f2d7a70
 -F src/sqlite.h.in 4f841d3d117b830ee5ee45e8d89ceff1195f3ebb72d041ace8d116ba4c103b35
 +F src/sqlite.h.in 4c2cbff81e321c4dc963a77c178e301db4721c438bdbd316fececd206e72ded7
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
 -F src/sqliteInt.h 08efc0ad9ddbbc5ea859111521dff2c4cecc589c0c9a3e4840c927663b31445b
 +F src/sqliteInt.h 50e1d15db5aed39a4162f409766d375ce2641fd3c306b3927c21dd8a248eab65
  F src/sqliteLimit.h 33b1c9baba578d34efe7dfdb43193b366111cdf41476b1e82699e14c11ee1fb6
  F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -800,12 -795,12 +801,12 @@@ F src/update.c 0f8df185d63e1d3a777ae889
  F src/upsert.c fa125a8d3410ce9a97b02cb50f7ae68a2476c405c76aa692d3acf6b8586e9242
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c b22cc9f203a8c0b9ee5338a67f8860347d14845864c10248bebe84518a781677
 -F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
 -F src/vdbe.c 7bd1c8301f01b1febaaeec52d5df62fcaf83f5e90ba9326f8b18470b4d52836a
 +F src/vacuum.c b1dd6d73869229b6e08bac910ac011dc9da42e3120ec2b7241accc5a752bd419
- F src/vdbe.c b5eab1441a5bc080745db166aff68aafacc5c669822c2be55de6b5d32bc79c1b
++F src/vdbe.c 947bf915060695661107ad91846827f93e370a2120d0f0eecd443bf4dcbebbd9
  F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
  F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
  F src/vdbeapi.c dd812ddd2f7806519e9d492c820456f86628bb6014b559034506e7f9d7f683c5
- F src/vdbeaux.c 3d9619c5ab4717c99b9d913b870f888b58478ec7c5bf6769ae2c1bc4a1c98014
 -F src/vdbeaux.c b51bdb7b2c6d17af604fb187bb22775e38cbca9e4e3f485a06a5fb7a6f9c21ca
++F src/vdbeaux.c 3c8ecc4829de008752f4461b499025139571a7cd3ee9fa2ae069a567cd77d85f
  F src/vdbeblob.c 13f9287b55b6356b4b1845410382d6bede203ceb29ef69388a4a3d007ffacbe5
  F src/vdbemem.c 0012d5f01cc866833847c2f3ae4c318ac53a1cb3d28acad9c35e688039464cf0
  F src/vdbesort.c 237840ca1947511fa59bd4e18b9eeae93f2af2468c34d2427b059f896230a547
@@@ -2178,11 -2156,8 +2179,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 827cf67fb37e2413069bf3c76aa054cc3b183845afbdfa118de948d3cf847054 2672572cc373e97054cc56dd0d48aaf56be5fef9704f7c177f64bd622151eadb
- R 877f40eb2372e8b3d07c38a1bff176d7
- T *branch * bedrock-3.44
- T *sym-bedrock-3.44 *
- T -sym-bedrock *
 -P 2672572cc373e97054cc56dd0d48aaf56be5fef9704f7c177f64bd622151eadb ebead0e7230cd33bcec9f95d2183069565b9e709bf745c9b5db65cc0cbf92c0f
 -R 79dd4db7e84abf2dfef496293e208c75
++P 84f4215716ebc6821a685e9e418f8de80aaf77d5a74c29908923d0b8a215a71f 0118e8c981fdfa4f8e593b56a2cbb97c489c3a97a3494f21a7a63b196659530c
++R 6e26ddafbcf776cb752d86284b9e8c15
  U drh
- Z c00eea53ab7d970a565d5f3a32a4d53f
 -Z c2e274816d57ff4863e5f579538a274a
++Z b65d09bc2e0ea4c5e98fcb56566a4c14
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 8792a32f54c0a745a5cde0d1e3411dc3f0b0bde9,f5c493a1ddcb1ec81354fd7c54b6c1dd90544f44..fe565d59b2a58016deb50897bbaf3e8a788b5ea2
@@@ -1,1 -1,1 +1,1 @@@
- 84f4215716ebc6821a685e9e418f8de80aaf77d5a74c29908923d0b8a215a71f
 -0118e8c981fdfa4f8e593b56a2cbb97c489c3a97a3494f21a7a63b196659530c
++1d9dfad077a8c3549b82d7813ad9bfbe3d8ef97a0b69b87612771c73810aeaf3
diff --cc src/select.c
Simple merge
diff --cc src/vdbe.c
Simple merge
diff --cc src/vdbeaux.c
Simple merge