database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-12-21 13:38:01 +03:00
Code Activity

Merge trunk enhancements into the file-info branch.

Browse Source 
FossilOrigin-Name: 73e1e081e9f7fc0ece98222669d13abde16197f0befc3343246a9e7da7856f02
This commit is contained in:
drh
2025-10-25 11:47:04 +00:00
parent 003737d1dc 76db3a6e66
commit f4e66056ac
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ext/wasm/mkwasmbuilds.c
View File

@@ -444,6 +444,11 @@ static void mk_prologue(void){
ps("endif"); ps("endif");
} }
ps("define label.unsupported-build\n"
"$(emo.fire)$(emo.fire)$(emo.fire)Unsupported build:"
" use at your own risk!\n"
"endef");
ps(zBanner ps(zBanner
/** $1 = build name */ /** $1 = build name */
"b.call.wasm-strip = " "b.call.wasm-strip = "
@@ -804,8 +809,8 @@ static void mk_lib_mode(const char *zBuildName, const BuildDef * pB){
emit_compile_start(zBuildName); emit_compile_start(zBuildName);
if( F_UNSUPPORTED & pB->flags ){ if( F_UNSUPPORTED & pB->flags ){
pf("\t@echo '$(logtag.%s) $(emo.fire)$(emo.fire)$(emo.fire): " pf("\t@echo '$(logtag.%s) $(label.unsupported-build)'\n",
"unsupported build. Use at your own risk.'\n", zBuildName); zBuildName);
} }
/* emcc ... */ /* emcc ... */
@@ -901,7 +906,11 @@ static void mk_lib_mode(const char *zBuildName, const BuildDef * pB){
} }
} }
pf("\t@$(call b.echo,%s,$(emo.done) done!)\n", zBuildName); pf("\t@$(call b.echo,%s,$(emo.done) done!%s)\n",
zBuildName,
(F_UNSUPPORTED & pB->flags)
? " $(label.unsupported-build)"
: "");
pf("\n%dbit: $(out.%s.js)\n" pf("\n%dbit: $(out.%s.js)\n"
"$(out.%s.wasm): $(out.%s.js)\n" "$(out.%s.wasm): $(out.%s.js)\n"

14
manifest
View File

@@ -1,5 +1,5 @@
C Improvements\sto\sthe\sdesign\sof\sthe\s/proc\slock\sanalysis. C Merge\strunk\senhancements\sinto\sthe\sfile-info\sbranch.
D 2025-10-24T23:12:33.738 D 2025-10-25T11:47:04.114
F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -632,7 +632,7 @@ F ext/wasm/index.html 54e27db740695ab2cb296e02d42c4c66b3f11b65797340d19fa6590f5b
F ext/wasm/jaccwabyt/jaccwabyt.js bbac67bc7a79dca34afe6215fd16b27768d84e22273507206f888c117e2ede7d F ext/wasm/jaccwabyt/jaccwabyt.js bbac67bc7a79dca34afe6215fd16b27768d84e22273507206f888c117e2ede7d
F ext/wasm/jaccwabyt/jaccwabyt.md 167fc0b624c9bc2c477846e336de9403842d81b1a24fc4d3b24317cb9eba734f F ext/wasm/jaccwabyt/jaccwabyt.md 167fc0b624c9bc2c477846e336de9403842d81b1a24fc4d3b24317cb9eba734f
F ext/wasm/mkdist.sh 29f8a37a7aba41fa5df8e89b1fab02b83b35c43473c5cf808584872e022514b8 x F ext/wasm/mkdist.sh 29f8a37a7aba41fa5df8e89b1fab02b83b35c43473c5cf808584872e022514b8 x
F ext/wasm/mkwasmbuilds.c cf79ccaf89e630781c7ad511b6c1db8b6ce6ff92ae33e19e2bde96f052576e88 F ext/wasm/mkwasmbuilds.c 1b53c4d2a1350c19a96a8cdfbda6a39baea9d2142bfe0cbef0ccb0e898787f47
F ext/wasm/module-symbols.html e54f42112e0aac2a31f850ab33e7f2630a2ea4f63496f484a12469a2501e07e2 F ext/wasm/module-symbols.html e54f42112e0aac2a31f850ab33e7f2630a2ea4f63496f484a12469a2501e07e2
F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96 F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96
F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63 F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63
@@ -720,7 +720,7 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06 F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
F src/os_kv.c fb7ba8d6204197357f1eb7e1c7450d09c10043bf7e99aba602f4aa46b8fb11a3 F src/os_kv.c fb7ba8d6204197357f1eb7e1c7450d09c10043bf7e99aba602f4aa46b8fb11a3
F src/os_setup.h 8efc64eda6a6c2f221387eefc2e7e45fd5a3d5c8337a7a83519ba4fbd2957ae2 F src/os_setup.h 8efc64eda6a6c2f221387eefc2e7e45fd5a3d5c8337a7a83519ba4fbd2957ae2
F src/os_unix.c ef2cab7e9adf8a9123fedf9570e517bee90afd5c28e0670665077cdcb1ead0eb F src/os_unix.c ec6d9ea99794f93b5f4a2ca5769f99c71e967741b574ff9debdea5825b5d5bd5
F src/os_win.c 5b14841f9c3ab76841c06a4eca20ba3e7747f44253eba9dfd3d918797e753d49 F src/os_win.c 5b14841f9c3ab76841c06a4eca20ba3e7747f44253eba9dfd3d918797e753d49
F src/os_win.h 4c247cdb6d407c75186c94a1e84d5a22cbae4adcec93fcae8d2bc1f956fd1f19 F src/os_win.h 4c247cdb6d407c75186c94a1e84d5a22cbae4adcec93fcae8d2bc1f956fd1f19
F src/pager.c 113f9149092ccff6cf90e97c2611200e5a237f13d26c394bc9fd933377852764 F src/pager.c 113f9149092ccff6cf90e97c2611200e5a237f13d26c394bc9fd933377852764
@@ -2171,8 +2171,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd
F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P d7bcc54beb6463501c0559333455bd2a378798b58cb48f35590e9026d07acd2f P f2809dd3b266c0a6a6eb4ed62812a907493fb4006d26f8905df7ff2b1ca01a5e ed01ed337c04cce4cdbb6e80628b6f716d537e072b80067bd2bd6c5d18a1454f
R 8d33f28289c9578897478104576c4047 R 7dd67122ca255adb0444f8e501e60504
U drh U drh
Z d0703c0dd028be4d90d4623b7127b76b Z 4ce899c38987e188b278f4b05ec7c492
# Remove this line to create a well-formed Fossil manifest. # Remove this line to create a well-formed Fossil manifest.

2
manifest.uuid
View File

@@ -1 +1 @@
f2809dd3b266c0a6a6eb4ed62812a907493fb4006d26f8905df7ff2b1ca01a5e 73e1e081e9f7fc0ece98222669d13abde16197f0befc3343246a9e7da7856f02

3
src/os_unix.c
View File

@@ -4647,7 +4647,8 @@ static int unixShmSystemLock(
/* Locks are within range */ /* Locks are within range */
assert( n>=1 && n<=SQLITE_SHM_NLOCK ); assert( n>=1 && n<=SQLITE_SHM_NLOCK );
assert( ofst>=UNIX_SHM_BASE && ofst<=(UNIX_SHM_DMS+SQLITE_SHM_NLOCK) ); assert( ofst>=UNIX_SHM_BASE && ofst<=UNIX_SHM_DMS );
assert( ofst+n-1<=UNIX_SHM_DMS );
if( pShmNode->hShm>=0 ){ if( pShmNode->hShm>=0 ){
int res; int res;