diff options
| author | danielk1977 <danielk1977@noemail.net> | 2007-08-31 17:42:48 +0000 |
|---|---|---|
| committer | danielk1977 <danielk1977@noemail.net> | 2007-08-31 17:42:48 +0000 |
| commit | e6a58a4e2a71f9d1b9a0680db9c0ed576b6b4d05 (patch) | |
| tree | 8241805099da326b60f383199b49ef70eaf4f5d7 /src/expr.c | |
| parent | cc6bb3eaebcff254e9ddb4d0f204656cf78d107b (diff) | |
| download | sqlite-e6a58a4e2a71f9d1b9a0680db9c0ed576b6b4d05.tar.gz sqlite-e6a58a4e2a71f9d1b9a0680db9c0ed576b6b4d05.zip | |
Allow sqllimits1.test to be run from a regular build of testfixture. Add the 'amalgamation-testfixture' target to main.mk - to build testfixture via sqlite3.c. (CVS 4354)
FossilOrigin-Name: d119427314d27f291b605073d34826cdb89746c1
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/expr.c b/src/expr.c index 7465ab90b..857177afb 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.310 2007/08/29 14:06:23 danielk1977 Exp $ +** $Id: expr.c,v 1.311 2007/08/31 17:42:48 danielk1977 Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -704,7 +704,7 @@ void sqlite3ExprListCheckLength( } -#if SQLITE_MAX_EXPR_DEPTH>0 +#if defined(SQLITE_TEST) || SQLITE_MAX_EXPR_DEPTH>0 /* The following three functions, heightOfExpr(), heightOfExprList() ** and heightOfSelect(), are used to determine the maximum height ** of any expression tree referenced by the structure passed as the @@ -1484,7 +1484,7 @@ int sqlite3ExprResolveNames( ){ int savedHasAgg; if( pExpr==0 ) return 0; -#if SQLITE_MAX_EXPR_DEPTH>0 +#if defined(SQLITE_TEST) || SQLITE_MAX_EXPR_DEPTH>0 if( (pExpr->nHeight+pNC->pParse->nHeight)>SQLITE_MAX_EXPR_DEPTH ){ sqlite3ErrorMsg(pNC->pParse, "Expression tree is too large (maximum depth %d)", @@ -1497,7 +1497,7 @@ int sqlite3ExprResolveNames( savedHasAgg = pNC->hasAgg; pNC->hasAgg = 0; walkExprTree(pExpr, nameResolverStep, pNC); -#if SQLITE_MAX_EXPR_DEPTH>0 +#if defined(SQLITE_TEST) || SQLITE_MAX_EXPR_DEPTH>0 pNC->pParse->nHeight -= pExpr->nHeight; #endif if( pNC->nErr>0 ){ |