Fix an assert that fired incorrectly when PRAGMA omit_readlock was set.
FossilOrigin-Name: e068758222bcd3f2367e9346f7154780cd395ddd
This commit is contained in:
parent
050d09abdc
commit
eb5dae1a65
12
manifest
12
manifest
@ -1,5 +1,5 @@
|
||||
C Changes\sto\sthe\smultiplex\sVFS\sto\soptionally\s(compiler\sdefine)\sallow\s\nthe\s"chunk\sextension"\sto\soverwrite\sthe\sright-most\schars\sof\sthe\sfilename\s\ninstead\sof\ssimply\sbeing\sappended.
|
||||
D 2010-11-08T19:16:16
|
||||
C Fix\san\sassert\sthat\sfired\sincorrectly\swhen\sPRAGMA\somit_readlock\swas\sset.
|
||||
D 2010-11-09T20:33:34
|
||||
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
|
||||
F Makefile.in e7a59672eaeb04408d1fa8501618d7501a3c5e39
|
||||
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
|
||||
@ -162,7 +162,7 @@ F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
|
||||
F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e
|
||||
F src/os_unix.c de5be4cdbf3d07018059934eaf7e5d8d594a895c
|
||||
F src/os_win.c 2f90f7bdec714fad51cd31b4ecad3cc1b4bb5aad
|
||||
F src/pager.c 1b0e87deb3994abf12e967ef5b9adc950bf85460
|
||||
F src/pager.c 067ae23d7a370eea6bd529848331c63879570adc
|
||||
F src/pager.h 8167a1e720d0b7a2790079007128e594010220ad
|
||||
F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
|
||||
F src/pcache.c 09d38c44ab275db581f7a2f6ff8b9bc7f8c0faaa
|
||||
@ -885,7 +885,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
||||
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
|
||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
|
||||
P 65fa1164f035d270db48db6474da888aacfba3bd
|
||||
R b100d3e162d12518a1c689502bc517e4
|
||||
P 07da0a0beffda324d28fd2768c542ff69d4dbff2
|
||||
R b71e4548ec0c287ed1f2245388ac9eb0
|
||||
U shaneh
|
||||
Z 5f41c44eac49aaf452bba5b19211e7d7
|
||||
Z d2106b3d8fbed7a3f8202cfd19fdedf9
|
||||
|
@ -1 +1 @@
|
||||
07da0a0beffda324d28fd2768c542ff69d4dbff2
|
||||
e068758222bcd3f2367e9346f7154780cd395ddd
|
@ -6571,7 +6571,7 @@ static int pagerOpenWal(Pager *pPager){
|
||||
int rc = SQLITE_OK;
|
||||
|
||||
assert( pPager->pWal==0 && pPager->tempFile==0 );
|
||||
assert( pPager->eLock==SHARED_LOCK || pPager->eLock==EXCLUSIVE_LOCK );
|
||||
assert( pPager->eLock==SHARED_LOCK || pPager->eLock==EXCLUSIVE_LOCK || pPager->noReadlock);
|
||||
|
||||
/* If the pager is already in exclusive-mode, the WAL module will use
|
||||
** heap-memory for the wal-index instead of the VFS shared-memory
|
||||
|
Loading…
Reference in New Issue
Block a user