database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-16 23:02:26 +03:00
Code Activity

Fix a bug reported on the mailing list triggered by the pattern "SELECT <col>, (SELECT ... FROM tbl WHERE rowid > <col>) FROM ...". (CVS 5855)

Browse Source 
FossilOrigin-Name: 6c918c4eb9362ebfdbe0486515679102b2862970
This commit is contained in:
danielk1977
2008-11-03 09:06:05 +00:00
parent 2d16fb1d34
commit 3072c5ea11
4 changed files with 66 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/where.c
View File

@@ -16,7 +16,7 @@
** so is applicable. Because this module is responsible for selecting
** indices, you might also think of this module as the "query optimizer".
**
** $Id: where.c,v 1.327 2008/10/25 15:03:21 drh Exp $
** $Id: where.c,v 1.328 2008/11/03 09:06:06 danielk1977 Exp $
*/
#include "sqliteInt.h"
@@ -2472,16 +2472,26 @@ WhereInfo *sqlite3WhereBegin(
}
if( pStart ){
Expr *pX;
int r1, regFree1;
int r1;
pX = pStart->pExpr;
assert( pX!=0 );
assert( pStart->leftCursor==iCur );
r1 = sqlite3ExprCodeTemp(pParse, pX->pRight, &regFree1);
/* The ForceInt instruction may modify the register that it operates
** on. For example it may replace a real value with an integer one,
** or if p3 is true it may increment the register value. For this
** reason we need to make sure that register r1 is really a newly
** allocated temporary register, and not part of the column-cache.
** For this reason we cannot use sqlite3ExprCodeTemp() here.
*/
r1 = sqlite3GetTempReg(pParse);
sqlite3ExprCode(pParse, pX->pRight, r1);
sqlite3VdbeAddOp3(v, OP_ForceInt, r1, brk,
pX->op==TK_LE || pX->op==TK_GT);
sqlite3VdbeAddOp3(v, bRev ? OP_MoveLt : OP_MoveGe, iCur, brk, r1);
VdbeComment((v, "pk"));
sqlite3ReleaseTempReg(pParse, regFree1);
sqlite3ReleaseTempReg(pParse, r1);
disableTerm(pLevel, pStart);
}else{
sqlite3VdbeAddOp2(v, bRev ? OP_Last : OP_Rewind, iCur, brk);