aboutsummaryrefslogtreecommitdiff
path: root/src/expr.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2008-10-07 19:53:14 +0000
committerdrh <drh@noemail.net>2008-10-07 19:53:14 +0000
commite82f5d04c330c21ba11285c03ff64950e12946bd (patch)
tree9fb9ae01350d5000ba601c0522dde76ac1c67eee /src/expr.c
parent18472fa7b80fffe589ac558e25d84b3969a70e70 (diff)
downloadsqlite-e82f5d04c330c21ba11285c03ff64950e12946bd.tar.gz
sqlite-e82f5d04c330c21ba11285c03ff64950e12946bd.zip
Raise the hard upper bound on SQLITE_MAX_FUNCTION_ARG to 1000 from 100.
The default upper bound is still 100, but it can now be raised as high as 1000 at compile-time. (CVS 5780) FossilOrigin-Name: 79df72ee836db91647913055ba6cf55558679b01
Diffstat (limited to 'src/expr.c')
-rw-r--r--src/expr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/expr.c b/src/expr.c
index b5fc4f9d1..c0760943e 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
** This file contains routines used for analyzing expressions and
** for generating VDBE code that evaluates expressions in SQLite.
**
-** $Id: expr.c,v 1.397 2008/10/06 05:32:19 danielk1977 Exp $
+** $Id: expr.c,v 1.398 2008/10/07 19:53:14 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -2030,11 +2030,11 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
if( sqlite3ExprIsConstant(pList->a[i].pExpr) ){
constMask |= (1<<i);
}
- if( pDef->needCollSeq && !pColl ){
+ if( (pDef->flags & SQLITE_FUNC_NEEDCOLL)!=0 && !pColl ){
pColl = sqlite3ExprCollSeq(pParse, pList->a[i].pExpr);
}
}
- if( pDef->needCollSeq ){
+ if( pDef->flags & SQLITE_FUNC_NEEDCOLL ){
if( !pColl ) pColl = db->pDfltColl;
sqlite3VdbeAddOp4(v, OP_CollSeq, 0, 0, 0, (char *)pColl, P4_COLLSEQ);
}