diff options
| author | Hans-Christoph Steiner <hans@eds.org> | 2012-09-20 18:34:38 -0400 |
|---|---|---|
| committer | Hans-Christoph Steiner <hans@eds.org> | 2012-09-20 18:34:38 -0400 |
| commit | 487e15dc239ccdb3344d1c99ce120e872bab4a74 (patch) | |
| tree | c986d492f6092ca7b4401d91515f74daed17fae2 /src/delete.c | |
| parent | 7bb481fda9ecb134804b49c2ce77ca28f7eea583 (diff) | |
Imported Upstream version 2.0.6
Diffstat (limited to 'src/delete.c')
| -rw-r--r-- | src/delete.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/delete.c b/src/delete.c index 147a5ca..eead485 100644 --- a/src/delete.c +++ b/src/delete.c @@ -148,7 +148,6 @@ Expr *sqlite3LimitWhere( */ if( pOrderBy && (pLimit == 0) ) { sqlite3ErrorMsg(pParse, "ORDER BY without LIMIT on %s", zStmtType); - pParse->parseError = 1; goto limit_where_cleanup_2; } @@ -375,7 +374,7 @@ void sqlite3DeleteFrom( pParse, pTabList, pWhere, 0, 0, WHERE_DUPLICATES_OK ); if( pWInfo==0 ) goto delete_from_cleanup; - regRowid = sqlite3ExprCodeGetColumn(pParse, pTab, -1, iCur, iRowid); + regRowid = sqlite3ExprCodeGetColumn(pParse, pTab, -1, iCur, iRowid, 0); sqlite3VdbeAddOp2(v, OP_RowSetAdd, iRowSet, regRowid); if( db->flags & SQLITE_CountRows ){ sqlite3VdbeAddOp2(v, OP_AddImm, memCnt, 1); |