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

Fix an error introduced with (2299). (CVS 2301)

Browse Source 
FossilOrigin-Name: 22041d5f26355b0fc80eb355bfec897fb50ac1e1
This commit is contained in:
danielk1977 2005-02-01 03:46:43 +00:00
parent 490a73bcde
commit 441daf68d2
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Lemon\soptimization:\s\sWhen\sdoing\sa\sshift\sfollowing\sa\sreduce\sthat\spops\sone\nor\smore\selements\soff\sthe\sstack,\sno\sneed\sto\scheck\sfor\sstack\soverflow.\s(CVS\s2300)
D 2005-02-01T03:20:00
C Fix\san\serror\sintroduced\swith\s(2299).\s(CVS\s2301)
D 2005-02-01T03:46:44
F Makefile.in ffd81f5e926d40b457071b4de8d7c1fa18f39b5a
F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@ -31,7 +31,7 @@ F src/attach.c f78f76bc6a8e5e487ca53636e21ccba2484a9a61
F src/auth.c 18c5a0befe20f3a58a41e3ddd78f372faeeefe1f
F src/btree.c e68ae12c8b12ef9d45d58d931c36c184055a3880
F src/btree.h 74d19cf40ab49fd69abe9e4e12a6c321ad86c497
F src/build.c 7b9427a2f9fccde0a4f543dd7ef6966ac005df78
F src/build.c fcb437bcda09a57b3fe898dff5ff558e7536621b
F src/cursor.c de73c00aefc4747ad59b5105cf38bbff0667922e
F src/date.c f3d1f5cd1503dabf426a198f3ebef5afbc122a7f
F src/delete.c 4b94395b52a8f7785acd71135c2ce54f3f5550b3
@ -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 eaf1866e4d10f0ddf5ccc02b7d9aff281ff9efc0
R 598decd81211763acd99dde118d03556
U drh
Z c40f8770402b118725e7463bbb95fcd4
P adcd9a3fa2a86464abd613aa88ae110b4799a241
R 4390b441d9dc8a1b90dd748f69f20841
U danielk1977
Z 82c01dc0abcdca97a122e56366b36569

2
manifest.uuid
View File

@ -1 +1 @@
adcd9a3fa2a86464abd613aa88ae110b4799a241
22041d5f26355b0fc80eb355bfec897fb50ac1e1

10
src/build.c
View File

@ -22,7 +22,7 @@
** COMMIT
** ROLLBACK
**
** $Id: build.c,v 1.307 2005/02/01 03:09:52 danielk1977 Exp $
** $Id: build.c,v 1.308 2005/02/01 03:46:44 danielk1977 Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@ -52,8 +52,10 @@ void sqlite3FinishCoding(Parse *pParse){
if( sqlite3_malloc_failed ) return;
if( pParse->nested ) return;
if( !pParse->pVdbe ) return;
if( !pParse->pVdbe ){
pParse->rc = pParse->nErr ? SQLITE_ERROR : SQLITE_DONE;
return;
}
/* Begin by generating some termination code at the end of the
** vdbe program
@ -98,7 +100,7 @@ void sqlite3FinishCoding(Parse *pParse){
sqlite3VdbeTrace(v, trace);
sqlite3VdbeMakeReady(v, pParse->nVar, pParse->nMem+3,
pParse->nTab+3, pParse->nMaxDepth+1, pParse->explain);
pParse->rc = pParse->nErr ? SQLITE_ERROR : SQLITE_DONE;
pParse->rc = SQLITE_DONE;
pParse->colNamesSet = 0;
}else if( pParse->rc==SQLITE_OK ){
pParse->rc = SQLITE_ERROR;