The BTree changes are now integrated and the whole thing compiles and
links. I have not yet tried to run it, though. (CVS 239)
FossilOrigin-Name: a0a1e701abc52a164d9b09a5426eb12af1fe6a4c
diff --git a/src/expr.c b/src/expr.c
index abc4963..0a1636c 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -24,7 +24,7 @@
** This file contains routines used for analyzing expressions and
** for generating VDBE code that evaluates expressions.
**
-** $Id: expr.c,v 1.25 2001/07/23 14:33:04 drh Exp $
+** $Id: expr.c,v 1.26 2001/09/13 14:46:10 drh Exp $
*/
#include "sqliteInt.h"
@@ -246,7 +246,7 @@
** table. The cursor number of the temporary table has already
** been put in iTable by sqliteExprResolveInSelect().
*/
- sqliteVdbeAddOp(v, OP_OpenIdx, pExpr->iTable, 1, 0, 0);
+ sqliteVdbeAddOp(v, OP_OpenTemp, pExpr->iTable, 0, 0, 0);
if( sqliteSelect(pParse, pExpr->pSelect, SRT_Set, pExpr->iTable) );
}else if( pExpr->pList ){
/* Case 2: expr IN (exprlist)
@@ -515,9 +515,9 @@
if( pParse->useAgg ){
sqliteVdbeAddOp(v, OP_AggGet, 0, pExpr->iAgg, 0, 0);
}else if( pExpr->iColumn>=0 ){
- sqliteVdbeAddOp(v, OP_Field, pExpr->iTable, pExpr->iColumn, 0, 0);
+ sqliteVdbeAddOp(v, OP_Column, pExpr->iTable, pExpr->iColumn, 0, 0);
}else{
- sqliteVdbeAddOp(v, OP_Key, pExpr->iTable, 0, 0, 0);
+ sqliteVdbeAddOp(v, OP_FullKey, pExpr->iTable, 0, 0, 0);
}
break;
}