diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/parse.y | 6 | ||||
| -rw-r--r-- | src/test_config.c | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/parse.y b/src/parse.y index 3959269cc..0ffcc2868 100644 --- a/src/parse.y +++ b/src/parse.y @@ -14,7 +14,7 @@ ** the parser. Lemon will also generate a header file containing ** numeric codes for all of the tokens. ** -** @(#) $Id: parse.y,v 1.259 2008/10/10 18:25:46 shane Exp $ +** @(#) $Id: parse.y,v 1.260 2008/10/11 17:06:04 drh Exp $ */ // All token codes are small integers with #defines that begin with "TK_" @@ -803,7 +803,9 @@ expr(A) ::= expr(W) between_op(N) expr(X) AND expr(Y). [BETWEEN] { sqlite3ExprListDelete(pParse->db, pList); } if( N ) A = sqlite3PExpr(pParse, TK_NOT, A, 0, 0); - sqlite3ExprSpan(A,&W->span,&Y->span); + if( !pParse->db->mallocFailed ){ + sqlite3ExprSpan(A,&W->span,&Y->span); + } } %ifndef SQLITE_OMIT_SUBQUERY %type in_op {int} diff --git a/src/test_config.c b/src/test_config.c index 20f481d0a..4780f640a 100644 --- a/src/test_config.c +++ b/src/test_config.c @@ -16,7 +16,7 @@ ** The focus of this file is providing the TCL testing layer ** access to compile-time constants. ** -** $Id: test_config.c,v 1.40 2008/10/10 23:48:26 drh Exp $ +** $Id: test_config.c,v 1.41 2008/10/11 17:06:04 drh Exp $ */ #include "sqliteLimit.h" @@ -309,6 +309,12 @@ static void set_options(Tcl_Interp *interp){ Tcl_SetVar2(interp, "sqlite_options", "localtime", "1", TCL_GLOBAL_ONLY); #endif +#ifdef SQLITE_OMIT_LOOKASIDE + Tcl_SetVar2(interp, "sqlite_options", "lookaside", "0", TCL_GLOBAL_ONLY); +#else + Tcl_SetVar2(interp, "sqlite_options", "lookaside", "1", TCL_GLOBAL_ONLY); +#endif + Tcl_SetVar2(interp, "sqlite_options", "long_double", sizeof(LONGDOUBLE_TYPE)>sizeof(double) ? "1" : "0", TCL_GLOBAL_ONLY); |