mirrors
/
sqlite
mirror of https://github.com/sqlite/sqlite
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Report the error SQLITE_CORRUPT instead of SQLITE_IOERR if unable 

to rollback a hot journal that was damaged (for example) by filesystem
corruption following a power failure. (CVS 3460)

FossilOrigin-Name: 70501e4ea588ed762e4f6bc211ce63397faa3367
This commit is contained in:
drh 2006-10-03 19:05:18 +00:00
parent bfe6631e7a
commit fa7d4acf0b
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Add\sthe\sOS-X\slocking\sstyle\spatches\sto\sos_unix.c.\s\sDisabled\sby\sdefault.\s(CVS\s3459)
D 2006-10-03T17:40:40
C Report\sthe\serror\sSQLITE_CORRUPT\sinstead\sof\sSQLITE_IOERR\sif\sunable\nto\srollback\sa\shot\sjournal\sthat\swas\sdamaged\s(for\sexample)\sby\sfilesystem\ncorruption\sfollowing\sa\spower\sfailure.\s(CVS\s3460)
D 2006-10-03T19:05:19
F Makefile.in cabd42d34340f49260bc2a7668c38eba8d4cfd99
F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@ -77,7 +77,7 @@ F src/os_unix.c a4fa8871c85e4daf90867c3f83fd1f1c36b80d60
F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
F src/os_win.c 30e51641b0cb88826f25b2afcf8db3c83b7e45dd
F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
F src/pager.c 0f966f7fa225c377da2021fbbfdd50a48d877000
F src/pager.c a1293bb4d318cfa9fa7100a08c38ad5598cb4436
F src/pager.h 0cff9de5e9019cb695a04d18df8caaaff933a272
F src/parse.y 8c79a1debbd92a4f5609511e9bf0222de78f5ecb
F src/pragma.c 2ef4353448e202961a22312f34695128bbb6d69a
@ -402,7 +402,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
P e774adce8e461a70ead9474cd64cb05c2d633eb9
R be5163749e3494dd3070e73f09b149bd
P f4103dea5e1a87adccccca715946e174d1cc7450
R b823a4405d336e3437b697936d5ec2bd
U drh
Z 94788eecca344ef23c892ffd0544d511
Z 59798d303c6fbc42955d097c88532f23

2
manifest.uuid
View File

@ -1 +1 @@
f4103dea5e1a87adccccca715946e174d1cc7450
70501e4ea588ed762e4f6bc211ce63397faa3367

6
src/pager.c
View File

@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while
** another is writing.
**
** @(#) $Id: pager.c,v 1.273 2006/09/15 12:29:16 drh Exp $
** @(#) $Id: pager.c,v 1.274 2006/10/03 19:05:19 drh Exp $
*/
#ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h"
@ -1341,6 +1341,10 @@ static int pager_playback(Pager *pPager){
pPager->journalOff = szJ;
break;
}else{
/* If we are unable to rollback a hot journal, then the database
** is probably not recoverable. Return CORRUPT.
*/
rc = SQLITE_CORRUPT;
goto end_playback;
}
}