]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Version 3.48.0 for the reuse-schema branch.
authordrh <>
Tue, 14 Jan 2025 12:43:51 +0000 (12:43 +0000)
committerdrh <>
Tue, 14 Jan 2025 12:43:51 +0000 (12:43 +0000)
FossilOrigin-Name: 1a031a536b0ada2b2c9eb01d097a4a82598e1b127f7051e7c37a8e00cbe5568c

1  2 
main.mk
manifest
manifest.uuid
src/shell.c.in
src/tclsqlite.c
src/where.c

diff --cc main.mk
Simple merge
diff --cc manifest
index a5ca30b3430c7d284928535808012562dd2cb490,809b43bc20c6921c2d0f7554ef16a716529562c6..170b582bf20d3474ff9e59496f044faa52612476
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sall\sthe\slatest\strunk\schanges\sinto\sthe\sbegin-concurrent\sbranch.
- D 2025-01-06T20:12:59.614
 -C Version\s3.48.0
 -D 2025-01-14T11:05:00.186
++C Version\s3.48.0\sfor\sthe\sreuse-schema\sbranch.
++D 2025-01-14T12:43:51.458
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -61,8 -61,7 +61,8 @@@ F doc/json-enhancements.md e356fc834781
  F doc/jsonb.md 5fab4b8613aa9153fbeb6259297bd4697988af8b3d23900deba588fa7841456b
  F doc/lemon.html 8b266ff711d2ec7f867c3dca37634963f48a630329908cc282beebfa8c708706
  F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
- F doc/tcl-extension-testing.md fca7b123e6f6c94f87c5e9285342fa08d17f118d47bea22c0b045485755fe9c3
 +F doc/shared_schema.md 759fc374709fccf4e5d2d0cbd05f8fedd38fb022bdd8a6c5b5f492684c7023b9
+ F doc/tcl-extension-testing.md 864875c3b672db79e7d42348dd726f9a4fbd852b1d8e5efcf09fe3d1ff6bf2a2
  F doc/testrunner.md 15583cf8c7d8a1c3378fd5d4319ca769a14c4d950a5df9b015d01d5be290dc69
  F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d358c3e8a
  F doc/vdbesort-memory.md 4da2639c14cd24a31e0af694b1a8dd37eaf277aff3867e9a8cc14046bc49df56
@@@ -617,8 -616,8 +617,8 @@@ F ext/session/sessionstat1.test 5e718d5
  F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc
  F ext/session/sqlite3session.c d6f5e3e83b9b0bbc4a8db4837284f0ecc6af5321d4c8e7136380b456b278c46a
  F ext/session/sqlite3session.h 683ccbf16e2c2521661fc4c1cf918ce57002039efbcabcd8097fa4bca569104b
- F ext/session/test_session.c aa29abdcc9011ac02f4fa38e8ede226106eaeee7c3ea7d8b2b999a124e0c368c
+ F ext/session/test_session.c 12e0a2c15fd60f92da4bb29c697c9177ff0c0dbcdc5129a54c47e999f147937a
 -F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 +F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
  F ext/wasm/GNUmakefile 311aa0d5edc7006409962cc77cc26560d92f9be69c2c4302e8bbc68189fd02db
  F ext/wasm/README-dist.txt 6382cb9548076fca472fb3330bbdba3a55c1ea0b180ff9253f084f07ff383576
  F ext/wasm/README.md a8a2962c3aebdf8d2104a9102e336c5554e78fc6072746e5daf9c61514e7d193
@@@ -701,7 -700,7 +701,7 @@@ F ext/wasm/tests/opfs/concurrency/test.
  F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
  F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b503bef35
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
- F main.mk 45e40d904758893578e0185ab975656424f69d237d43a12b3404ca01859da4b6
 -F main.mk 0b62344246f8a3e920edb8a52b0c3296dde829d7eb450f67b89c63d79536de85
++F main.mk f2885b127f61be1fba7f83d8bf6d4ea6aa195c7109241f4a92e901c37c3061ed
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@@ -780,17 -779,17 +780,17 @@@ F src/random.c 606b00941a1d7dd09c381d32
  F src/resolve.c c8a5372b97b2a2e972a280676f06ddb5b74e885d3b1f5ce383f839907b57ef68
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c 83e88fbb36f89b6703b348777491619554f0fd6f917c9fdf51e4c2e9cda6c04e
- F src/shell.c.in 32ae9365992cbf53c6ec7ca6bb306cebbced45944427da5806c96114fa2252e7
 -F src/shell.c.in beb370609906092a6810fcd9ea76737be2c91694445061c2eb05c4c0a3753de4
 -F src/sqlite.h.in 6afbcaae44140216704a6c82e4c4ea4118c46d5f6573d6c5fa4fc901ed9d369e
++F src/shell.c.in d9d33310df3e343ea32f928d208312e9090e5c87d3faf5bf6398175c8d2bd4b8
 +F src/sqlite.h.in 051ecb184e142af5a1465c0ae42c81d92ea32a8d73463a43da05ebcff206f7b7
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
 -F src/sqliteInt.h 3f20dfb5ae54e787b2643edc0b5bae0cecddfb89988e28afdc3c0b05892e25cc
 +F src/sqliteInt.h 965688f4a887ce4747452002c148d5035757e58974215731d56e0024d876e412
  F src/sqliteLimit.h 1bbdbf72bd0411d003267ffebc59a262f061df5653027a75627d03f48ca30523
 -F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
 +F src/status.c 5028a0afee355aa492f26f0b6a3ec23145caa9261a93164d96cd0b9bf1b2318f
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
- F src/tclsqlite.c 0ee1a54f90615bcef1bc7c70daa2e51db807a69ce2adde29fdf3b38dd42765aa
 -F src/tclsqlite.c c6b9d3a0b1100e1e028460c418c41ca180dac5958e96bef79f6799b552522a37
++F src/tclsqlite.c 120e6d3928e732b227886a0500355c858624c3f76e75ad02d5bd768c72be4ff3
  F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395
- F src/test1.c 7f5579f2786c11cf4391ec2abb7b5b5b234ca1408599d7a0d6dd32360e5f58d8
+ F src/test1.c 9d2da51b4c33633e7370e4068af6d16d2c52b22a5810ec012ac32e77f8397b64
  F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3
  F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b
  F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d
@@@ -864,7 -862,7 +864,7 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 4e6181d8780ab0af2e1388d0754cbe6f2f04593d2b1ab6c41699a89942fd8997
  F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
  F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
- F src/where.c 50fd9886719931b5eadb275601b74c0c2a4c3030a73d70e7d0ec1dd4ad581de9
 -F src/where.c 604f17baed46f4997ffe79f25c07c4b51a4165a5938cc27fe165c7e1ca485d11
++F src/where.c 93cd2d47095ce3d1a61f0e25e214a7ed799ecefa4572fa6db3ff3c77846862a3
  F src/whereInt.h 1e36ec50392f7cc3d93d1152d4338064cd522b87156a0739388b7e273735f0ca
  F src/wherecode.c 0c3d3199a2b769a5e2bb70feb5003dc85b3d86842ecaf903a47f2b4205ca5dab
  F src/whereexpr.c 0f93a29cabd3a338d09a1f5c6770620a1ac51ec1157f3229502a7e7767c60b6f
@@@ -2217,8 -2205,11 +2217,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 3b485202da8358c4495fd76dae13f739e1206c12fe10b26df719ad1aaccb3401 a0df29c7a3eb4f558aba00598d827643830591def3101a4d5464543527b8d13c
- R a46ba8d0ddd61da2e5714f048be91a2d
 -P 315079b150b47e013e2cde4985bc39d24e0f6f6c6e60f9383fb8ea4ea897c67a
 -R 0ed0cfcc7f2bc831da5d62a3490571ed
 -T +sym-major-relase *
 -T +sym-relase *
 -T +sym-version-3.48.0 *
++P 3703a844374743d7daab34c5db271aaaa7776f60729e67214e4e4f27608d139a d2fe6b05f38d9d7cd78c5d252e99ac59f1aea071d669830c1ffe4e8966e84010
++R e1ec848ad4650bca16348452928f22ee
  U drh
- Z 773228cfc347d76094d41d0b6d46b6af
 -Z cc77aac977f98c5521d75f4212754ff8
++Z 65786f86b7a4cdb44171c1a8ed338f55
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 74c6a64c8dc82a896d8a411a3e3b2ee71b7c59da,582262f689b8468addb745dd24590f24a67f4da6..058f1343388f0947eb8825023e2ec5be7a94dfd8
@@@ -1,1 -1,1 +1,1 @@@
- 3703a844374743d7daab34c5db271aaaa7776f60729e67214e4e4f27608d139a
 -d2fe6b05f38d9d7cd78c5d252e99ac59f1aea071d669830c1ffe4e8966e84010
++1a031a536b0ada2b2c9eb01d097a4a82598e1b127f7051e7c37a8e00cbe5568c
diff --cc src/shell.c.in
Simple merge
diff --cc src/tclsqlite.c
Simple merge
diff --cc src/where.c
Simple merge