database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-11 01:42:22 +03:00
Code Activity

Fix the multiplexor so that it works with WAL mode and 8+3 filenames.

Browse Source 
FossilOrigin-Name: a9fcb46bc08c29aebaf3bc999f45846c3c320f68
This commit is contained in:
drh
2012-02-24 15:57:13 +00:00
parent 70708600b5
commit 1a3dd3d445
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Add\s#ifdef\sSQLITE_ENABLE_ZIPVFS\saround\sthose\sbits\sof\scode\sthat\sare\sonly\nused\sby\sZIPVFS. C Fix\sthe\smultiplexor\sso\sthat\sit\sworks\swith\sWAL\smode\sand\s8+3\sfilenames.
D 2012-02-24T14:33:28.413 D 2012-02-24T15:57:13.518
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34 F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -214,7 +214,7 @@ F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
F src/test_journal.c a6a6baf343f79b942331f13378d045e7e270ae64 F src/test_journal.c a6a6baf343f79b942331f13378d045e7e270ae64
F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
F src/test_malloc.c cfe25d74333892ababde61196821a889b4756dee F src/test_malloc.c cfe25d74333892ababde61196821a889b4756dee
F src/test_multiplex.c afab2c9d292677ab31e0dd4b3dde2420fb655c5f F src/test_multiplex.c 31fb992ab388a23813c0cb003dc3c0463aa149ac
F src/test_multiplex.h e99c571bc4968b7a9363b661481f3934bfead61d F src/test_multiplex.h e99c571bc4968b7a9363b661481f3934bfead61d
F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec
@@ -990,7 +990,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
P 9e6d340f557c2f2c8a07300ac60357af9906a7fa P 3130275c64a60c5cfacbd11123305e6d99ea866d
R ea57edcd6f93a841cf2e153be1c9f0e7 R a63fc7ff56ad9219f116d84627834be8
U drh U drh
Z 92fb8a3e30d52bd11c67570a5d62f0a2 Z 13fd34b3ced0bed8422321ec5813b610

2
manifest.uuid
View File

@@ -1 +1 @@
3130275c64a60c5cfacbd11123305e6d99ea866d a9fcb46bc08c29aebaf3bc999f45846c3c320f68

2
src/test_multiplex.c
View File

@@ -256,7 +256,7 @@ static void multiplexFilename(
int i; int i;
for(i=n-1; i>0 && i>=n-4 && zOut[i]!='.'; i--){} for(i=n-1; i>0 && i>=n-4 && zOut[i]!='.'; i--){}
if( i>=n-4 ) n = i+1; if( i>=n-4 ) n = i+1;
if( flags & SQLITE_OPEN_MAIN_JOURNAL ){ if( flags & (SQLITE_OPEN_MAIN_JOURNAL|SQLITE_OPEN_WAL) ){
/* The extensions on overflow files for main databases are 001, 002, /* The extensions on overflow files for main databases are 001, 002,
** 003 and so forth. To avoid name collisions, add 400 to the ** 003 and so forth. To avoid name collisions, add 400 to the
** extensions of journal files so that they are 401, 402, 403, .... ** extensions of journal files so that they are 401, 402, 403, ....