]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge all 3.42.0 release enhancements into the reuse-schema branch.
authordrh <>
Tue, 16 May 2023 13:11:33 +0000 (13:11 +0000)
committerdrh <>
Tue, 16 May 2023 13:11:33 +0000 (13:11 +0000)
FossilOrigin-Name: d67b6c393fbf30b712ce372eede8a5ddc1ea4937be5278bfa1acd8e9d7843873

1  2 
Makefile.msc
manifest
manifest.uuid
src/shell.c.in
src/sqlite.h.in
src/sqliteInt.h
src/where.c

diff --cc Makefile.msc
Simple merge
diff --cc manifest
index 32e7b4e1537252ff290706782fbedc3e8f16d55b,515248a699f366ea6b339425952596510c273121..e28f7f5dfc08273951b69bdad30f287e7dc5ca87
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Add\sthe\s"--unsafe-testing"\soption\sto\sinvocations\sof\sthe\sshell\stool\smade\sby\stest\sscript\sreuse5.test.
- D 2023-05-13T15:55:42.987
 -C Version\s3.42.0
 -D 2023-05-16T12:36:15.536
++C Merge\sall\s3.42.0\srelease\senhancements\sinto\sthe\sreuse-schema\sbranch.
++D 2023-05-16T13:11:33.824
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 -F Makefile.in 764f2e3e8fb4ae1c8dfe03e65b2b3b01bd1fc57edf78ec2cab3a1301e90e1905
 +F Makefile.in 5a8cd992b7e51f372412b6803d70b541e125f3de7aee4c7e7ba7b9accb80d0fe
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc ae1a92126be08f8b68d9f1881870a2b27abb76924e22ac2566f8938abf27ac8d
 -F Makefile.msc ce7bea7931e1ef96b0f44c0362074a8bb62e61a0e7cfdb05afebd928adaacc2b
++F Makefile.msc 86b3c109466e7859cc3276b029223e0d6c3be53fb0fe44a0baf3ce515c9e6c2e
  F README.md e05bd8fcb45da04ab045c37f79a98654e8aa3b3b8f302cfbba80a0d510df75f7
  F VERSION 17f95ae2fdf21f0e9575eb0b0511ea63f15d71dfff431b21c2b4adbfa70cfbbf
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -636,16 -636,16 +637,16 @@@ F src/printf.c b9320cdbeca0b336c3f139fd
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
  F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 12aa3168be4ff175702fe0ebeaf544312be22d275d378a28e7b2fad32d552d36
- F src/shell.c.in 2c3ec7020288cfe7fafd93334499279734d7dd094e252be0c5a8f5340437c78d
- F src/sqlite.h.in 71c3f971d327cda29f5330c64c66b8fa9497009037f4b62c01463e27f68a523e
+ F src/select.c 738c3a3d6929f8be66c319bad17f6b297bd60a4eb14006075c48a28487dc7786
 -F src/shell.c.in 52836b4002a2cad8095b451f0c39a6542c23a231eb0ed5e39387bc8b1f7aaa9e
 -F src/sqlite.h.in c14a4471fcd897a03631ac7ad3d05505e895e7b6419ec5b96cae9bc4df7a9fc6
++F src/shell.c.in 9178f7f3bc737dfb092e0d0664a7affab0bc1a5f53bdd77f1030f30ccae53c4d
++F src/sqlite.h.in 8a2cad698b01da4c098d29bdd6bc8fc0807a3b29a3185fe99b365aba15c6481b
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
- F src/sqliteInt.h 1c94cf6269b7d2941a06312911d2e6d869fc98979d47d011a87236352c66988f
 -F src/sqliteInt.h a3ced8b9ebc573189c87b69f24bf10d2b9cd3cefefaae52623a2fa79e6fdd408
++F src/sqliteInt.h 95f033fabe8de5994c560e88e52d58452cc636b191983e32405ba968f0b989b4
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 -F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 +F src/status.c 501433a8bdf64be125746a53bb9180761f9364428b59b318365eb88afd6d5cea
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c 8522a04fb9c84faa1d80354430ae0ee9349727a3a4b32e3cfe39b9be8324cabd
 +F src/tclsqlite.c be4795cda32a6dd448578320b04b95ecce09ad0d7aeb95ede203c91af31b81fd
  F src/test1.c 8eab61fb2813aa212d97ab188e85fc9ca7b89d9ff5ff05d59d9aa0c491a6c721
  F src/test2.c 827446e259a3b7ab949da1542953edda7b5117982576d3e6f1c24a0dd20a5cef
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
@@@ -722,7 -721,7 +723,7 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 7a65f64bfe4a783c5e2df73ffb0efc383dec934dee9e3ac706b2eeb3631d17ac
  F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
- F src/where.c c2c8ce91ce82a883e98ed767277e54807180da7c92f700e0c47ca23e6d279158
 -F src/where.c b74a83b4c8f65b218c5c1c8d9122433f85ee1300fd9263ba1697d0e1040eeb36
++F src/where.c d1830ebedab8bbfb181dcae11add7e53b7202287a6d84fe9bd726ff96eee7f58
  F src/whereInt.h e25203e5bfee149f5f1225ae0166cfb4f1e65490c998a024249e98bb0647377c
  F src/wherecode.c b300db0bcd84ad6c2642bf3f509f92fad7b7d697b9856b64dd66d692d184d054
  F src/whereexpr.c 22cf19b0ececeaf838daed1039c5231a8778784eba5ad67b991442a23473fd3f
@@@ -2079,8 -2070,10 +2080,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 515bb26ee6e7c0244e7ae91438c3bd468e6ffb405305399ad8b272b354284f26
- R 84ac00c322826aba4bf1840d231ded4e
- U dan
- Z 47876fe24139417933f68087bf185bd8
 -P 4254f086419892634c80b0b915e14edea365adc6a45bcc75eecba889da274ac3
 -R 5363a07f3e1462ec2f4570a33edb7167
 -T +sym-release *
 -T +sym-version-3.42.0 *
++P d6971af74b4dcc4d2a4ed5e4d9aa81c2e43e0ca25bd2fbdaf16553fa0ea69d6d 831d0fb2836b71c9bc51067c49fee4b8f18047814f2ff22d817d25195cf350b0
++R 0f88e3860ba8b8316f1529c617dc78b6
+ U drh
 -Z 0ee8e0816fa6ac728bed7565aed4ec35
++Z 0274c02470de812044733023b2b09ed8
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 2130b09820071c6ecf997369ae2357dc3c9b2951,8d5c8bc91bb5ba5d95ed18351be744a5dcefdd78..c40de1b92611663729d789cefc9512a059034fd3
@@@ -1,1 -1,1 +1,1 @@@
- d6971af74b4dcc4d2a4ed5e4d9aa81c2e43e0ca25bd2fbdaf16553fa0ea69d6d
 -831d0fb2836b71c9bc51067c49fee4b8f18047814f2ff22d817d25195cf350b0
++d67b6c393fbf30b712ce372eede8a5ddc1ea4937be5278bfa1acd8e9d7843873
diff --cc src/shell.c.in
Simple merge
diff --cc src/sqlite.h.in
Simple merge
diff --cc src/sqliteInt.h
Simple merge
diff --cc src/where.c
Simple merge