]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge all the latest trunk enhancements into the coroutines-exp2 enhancement coroutines-exp2
authordrh <>
Wed, 14 Dec 2022 17:52:15 +0000 (17:52 +0000)
committerdrh <>
Wed, 14 Dec 2022 17:52:15 +0000 (17:52 +0000)
branch.

FossilOrigin-Name: ea278438b72e85d217e72c836cbefd68bd8b336baf33507b2d8d12ef436424cd

1  2 
manifest
manifest.uuid
src/select.c
src/sqliteInt.h

diff --cc manifest
index 2f9c7f56cb74d79c9758676e4024f879c46ee79c,35df2843b353719e37f4cc1c57b4316a0457ad9b..006b871798a0ce6f809a26abf2c0ac9e0f665caf
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\srecent\strunk\schanges\sinto\sthe\scoroutine-exp2\sbranch.
- D 2022-12-13T00:51:34.741
 -C Rework\sthe\scode\sthat\scomputes\sthe\sdatatypes\sand\saffinities\sfor\ssubqueries\nand\sviews.\s\sIf\sthe\ssubquery/view\sis\sconstructed\sfrom\sa\scompound\sSELECT\swhere\nthe\saffinity\svaries\sacross\sarms\sof\sthe\scompound,\sset\sthe\saffinity\sfor\sthe\ncorresponding\scolumn\sin\sthe\sconstructed\sview\sto\sbe\sBLOB\sso\sthat\sit\sis\sallowed\nto\stake\son\sany\sdata\stype.
 -D 2022-12-14T17:46:35.207
++C Merge\sall\sthe\slatest\strunk\senhancements\sinto\sthe\scoroutines-exp2\senhancement\nbranch.
++D 2022-12-14T17:52:15.943
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -645,12 -645,12 +645,12 @@@ F src/printf.c e99ee9741e79ae3873458146
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
  F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 4ad0aa2b21a94b118f6f6f1c9baf8e932d14227e8a9a5022b86e661049681c3a
 -F src/select.c 3b72630ae4f00a96abd5be49be67457d49b35eb8c9d97e4d4f05525f320c9d72
++F src/select.c 505b265ec68da42e40498b35d57c9937481c94065e91b151a27501cd3ab4d65e
  F src/shell.c.in 8d9dc02dd03f8fc93f3e3cdb17d8d16e8ddb985dddad213985c08186900a3ebb
  F src/sqlite.h.in e752f82b9d71f1d42b259b1900e4b1caf0965e844d756cd5cc91cc2cf45ed925
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
- F src/sqliteInt.h ef0c1af2d7b46ce89fe698ce5f1a26d19110780ac19ec1ef5a227f7e51e97de3
 -F src/sqliteInt.h 0c93dfce0ee43fa3d0391f453b956b8f222f416a16d7dc275d6f9607ee7f7bdc
++F src/sqliteInt.h 58dac6ab1352193715dc7de71cf900cafce6c3064a7331dc8b2029a6165a2b92
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -2067,8 -2067,9 +2067,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 78723a9a7e72b42d28fc5645661da17f20cedcf864819b861800ad9340007be1 f0325359d5795237b79f90f21b42d7d942c7e918137cb0231d404365d3041e81
- R fab8476faef04e68db98cfe4c1810ebc
 -P 349bb28f614bc210b3283ed1c1144c45fbc7d9e2ffc3dc6193ccb9932d347efb 6ebb178c6b688ebd632e91a5ec4c748567833037c679ab3d72fb770deb230fe1
 -R f920a5948608f4bc33fea80bc8d67560
 -T +closed 6ebb178c6b688ebd632e91a5ec4c748567833037c679ab3d72fb770deb230fe1
++P c43f433bcab29db0f1f8afd3948f5a4149e1f277c853c66f99c31f226d82bc0f 27655c9353620aa58105e87d1e171d1f0a637deedde41c081824078385cd49ac
++R a3c06794ccb982a7d2a817a1735839a4
  U drh
- Z 1279761382706bd160c45650b0901daf
 -Z 8100acbd11a7404ffd2194b46d0236b1
++Z 37129f29a116af5663e258b7d55fecf7
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 802efdc5e212b043c3a28e762b9d57a3665c3973,8326d613cb14b12f6098b4ca2e02e5626e826e56..c0b35fffd5d2d57444c3125efdd3923407e597a7
@@@ -1,1 -1,1 +1,1 @@@
- c43f433bcab29db0f1f8afd3948f5a4149e1f277c853c66f99c31f226d82bc0f
 -27655c9353620aa58105e87d1e171d1f0a637deedde41c081824078385cd49ac
++ea278438b72e85d217e72c836cbefd68bd8b336baf33507b2d8d12ef436424cd
diff --cc src/select.c
Simple merge
diff --cc src/sqliteInt.h
Simple merge