Comment out a recently added assert statement that is failing. (CVS 6340)

FossilOrigin-Name: d0b2015f1caf2fc60ec82bd8e760f7b61befa3b4

diff --git a/manifest b/manifest
index 6b99d0b23b3df90b9abf674502341e18633c751b..4db200054725fa02dbb460d9bec09436ece2d8be 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Implemented\swinSectorSize();\sOther\schanges\sfor\sconsistency.\s\sos_win.c.\s\sTicket\s#2931.\s(CVS\s6339)
-D 2009-03-05T05:54:55
+C Comment\sout\sa\srecently\sadded\sassert\sstatement\sthat\sis\sfailing.\s(CVS\s6340)
+D 2009-03-05T14:53:18
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d64baddbf55cdf33ff030e14da837324711a4ef7
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -111,7 +111,7 @@ F src/callback.c 09c6fedc77a45db99ba25a75d61382830314b357
 F src/complete.c cb14e06dbe79dee031031f0d9e686ff306afe07c
 F src/date.c 0d804df3bbda46329946a01ff5c75c3f4f135218
 F src/delete.c eb1066b2f35489fee46ad765d2b66386fc7d8adf
-F src/expr.c b9273cdd529886dd8982eadeff3bb6aa33acfe53
+F src/expr.c 09a3a1d6490d95d3185e43e1c772e074bdb31b6f
 F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff
 F src/func.c de2eed7d96365210faecda877c5a12cf440bdf42
 F src/global.c 448419c44ce0701104c2121b0e06919b44514c0c
@@ -703,7 +703,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 3dbdf68030855a5da24de0ae2f10a26da2531d33
-R 93580061acc7426f99498a97ca6f1c0d
-U shane
-Z fe989efe3b3e3aab1842ad05067b7cd6
+P 68abcb278ced40c0d97af724dbd1b751a3becdc2
+R 0b19691adcd1739892b0541fe5daf832
+U danielk1977
+Z e314e181dfce2d061b5e2a985f7bf325

diff --git a/manifest.uuid b/manifest.uuid
index ffe41ef6afe8022a0f179cbeecedada9d5026530..d30a971f9a31e1fc1b5aed4da1ae08b8f62c3aec 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-68abcb278ced40c0d97af724dbd1b751a3becdc2
\ No newline at end of file
+d0b2015f1caf2fc60ec82bd8e760f7b61befa3b4
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 4b5928315e300d601f0ae525a24ecad30f7bf545..2d4641362c50f58ead9b1e53cd47285acae8a92d 100644 (file)
--- 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.417 2009/03/05 03:48:07 shane Exp $
+** $Id: expr.c,v 1.418 2009/03/05 14:53:18 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -494,7 +494,9 @@ void sqlite3ExprSpan(Expr *pExpr, Token *pLeft, Token *pRight){
   assert( pLeft!=0 );
   if( pExpr ){
     pExpr->span.z = pLeft->z;
-    assert(pRight->z >= pLeft->z);
+    /* The following assert() may fail when this is called 
+    ** via sqlite3PExpr()/sqlite3Expr() from addWhereTerm(). */
+    /* assert(pRight->z >= pLeft->z); */
     pExpr->span.n = pRight->n + (unsigned)(pRight->z - pLeft->z);
   }
 }