mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More changes to improve propagation of SQLITE_CORRUPT errors. (CVS 2282)

Browse Source 
FossilOrigin-Name: e4b5c16858db3b17a13cb572896bfd3dc08b88c1
This commit is contained in:
drh 2005-01-27 00:33:21 +00:00
parent 81e9674ba6
commit 52f159e040
3 changed files with 14 additions and 14 deletions

14
manifest

@ -1,5 +1,5 @@
C Test\sthat\sit\sis\sok\sto\sexecute\sALTER\sTABLE\simmediately\safter\sopening\sa\sdatabase\sconnection.\s(CVS\s2281)
D 2005-01-27T00:30:52
C More\schanges\sto\simprove\spropagation\sof\sSQLITE_CORRUPT\serrors.\s(CVS\s2282)
D 2005-01-27T00:33:21
F Makefile.in ffd81f5e926d40b457071b4de8d7c1fa18f39b5a
F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@ -75,7 +75,7 @@ F src/update.c 6e5c6eb660a5508c449c6d637571e24ef13f70a1
F src/utf.c 9bece2c7b94d9002ab1bb900a7658c6f826b0f74
F src/util.c a858b93ba06bbafab55ba41e4d58538eb51f4b6a
F src/vacuum.c 1a9db113a027461daaf44724c71dd1ebbd064203
F src/vdbe.c 2f2fc0c785022384a2914ff1f1e1d0768bd67829
F src/vdbe.c 8e877a9cdc92f30a71510e427db5e99d1f989c54
F src/vdbe.h 067ca8d6750ba4f69a50284765e5883dee860181
F src/vdbeInt.h 24d411de9efc6919a1e580069a597182be269bcf
F src/vdbeapi.c 467caa6e6fb9247528b1c7ab9132ae1b4748e8ac
@ -272,7 +272,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
P 1c1904f44310fa0e327d8f0a77f1cf97599b630a
R 31f86bcda482ef329881071b35a3c655
U danielk1977
Z adda114cce96c39793e236df20bae53b
P 1d5ebb1146cc6e59d8b419b3fa4796552111606d
R 56e4175a578bb4fb9141aeb0a70310d3
U drh
Z 0c4adfe6a7238770087bed92ee0cbbde

2
manifest.uuid

@ -1 +1 @@
1d5ebb1146cc6e59d8b419b3fa4796552111606d
e4b5c16858db3b17a13cb572896bfd3dc08b88c1

12
src/vdbe.c

@ -43,7 +43,7 @@
** in this file for details. If in doubt, do not deviate from existing
** commenting and indentation practices when changing or adding code.
**
** $Id: vdbe.c,v 1.447 2005/01/26 21:55:32 drh Exp $
** $Id: vdbe.c,v 1.448 2005/01/27 00:33:21 drh Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@ -1739,7 +1739,7 @@ case OP_Column: {
}else if( (pC = p->apCsr[p1])->pCursor!=0 ){
/* The record is stored in a B-Tree */
rc = sqlite3VdbeCursorMoveto(pC);
if ( rc ) return rc;
if( rc ) goto abort_due_to_error;
zRec = 0;
pCrsr = pC->pCursor;
if( pC->nullRow ){
@ -3085,7 +3085,7 @@ case OP_Delete: {
assert( pC!=0 );
if( pC->pCursor!=0 ){
rc = sqlite3VdbeCursorMoveto(pC);
if ( rc ) return rc;
if( rc ) goto abort_due_to_error;
rc = sqlite3BtreeDelete(pC->pCursor);
pC->nextRowidValid = 0;
pC->cacheValid = 0;
@ -3159,7 +3159,7 @@ case OP_RowData: {
}else if( pC->pCursor!=0 ){
BtCursor *pCrsr = pC->pCursor;
rc = sqlite3VdbeCursorMoveto(pC);
if ( rc ) return rc;
if( rc ) goto abort_due_to_error;
if( pC->nullRow ){
pTos->flags = MEM_Null;
break;
@ -3215,7 +3215,7 @@ case OP_Recno: {
pC = p->apCsr[i];
assert( pC!=0 );
rc = sqlite3VdbeCursorMoveto(pC);
if ( rc ) return rc;
if( rc ) goto abort_due_to_error;
pTos++;
if( pC->recnoIsValid ){
v = pC->lastRecno;
@ -3262,7 +3262,7 @@ case OP_FullKey: {
char *z;
rc = sqlite3VdbeCursorMoveto(pC);
if ( rc ) return rc;
if( rc ) goto abort_due_to_error;
assert( pC->intKey==0 );
sqlite3BtreeKeySize(pCrsr, &amt);
if( amt<=0 ){