Fix the SQLITE_ENABLE_UPDATE_DELETE_LIMIT option for the new Expr compression

logic of check-in (6305).  Bug discovered during regression testing. (CVS 6333)

FossilOrigin-Name: 91969edac737adf087e35e10aa0a732b3303afd5

diff --git a/manifest b/manifest
index 9df03fac7a46fec5a4b54c540b6da9ede85a440b..27fc08fc22e57094278f29a67d2d42a8597b97c7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\sthe\sGROUP\sBY\salias\sname\sresolution.\sThe\sbug\swas\sby\ncheck-in\s(6305).\s\sDiscovered\sby\sregression\stest\son\s64-bit\slinux.\nTest\scases\sadded\sso\sthat\sthe\sproblems\sis\sdetected\son\s32-bit\ssystems.\s(CVS\s6332)
-D 2009-03-02T01:22:40
+C Fix\sthe\sSQLITE_ENABLE_UPDATE_DELETE_LIMIT\soption\sfor\sthe\snew\sExpr\scompression\nlogic\sof\scheck-in\s(6305).\s\sBug\sdiscovered\sduring\sregression\stesting.\s(CVS\s6333)
+D 2009-03-02T14:24:21
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d64baddbf55cdf33ff030e14da837324711a4ef7
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -110,7 +110,7 @@ F src/build.c 741240c8d6a54201fa8757db1ee6efba71be59a2
 F src/callback.c 5f10bca853e59a2c272bbfd5b720303f8b69e520
 F src/complete.c cb14e06dbe79dee031031f0d9e686ff306afe07c
 F src/date.c 0d804df3bbda46329946a01ff5c75c3f4f135218
-F src/delete.c 506ff477a11ffaaa7493536fecc25e75130214fd
+F src/delete.c 179db8e47c7bed95675d9021eb1bbf4618c1b0d7
 F src/expr.c 46e24f9a71e7bdd2573a790ba2f98b7c3f617d04
 F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff
 F src/func.c de2eed7d96365210faecda877c5a12cf440bdf42
@@ -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 a2373e5409e4e59903f315a4446db8cb6ba000cc
-R 63b49fa689a852f21c1ea5f0d83afe2b
+P fa0008502ec4f891bfed4a11f01650d274f95c44
+R 2c5d637ae25f70e2979b8bbfbc66302e
 U drh
-Z 0b75cd981aa0c228ad7eaacfbe7139e5
+Z d4099cbbbd53062fe6677a5f23729bc8

diff --git a/manifest.uuid b/manifest.uuid
index e122f7f20061ca026656ba832f00147cdb9aae50..a3c4c6b235ca22a400562a5872a9d1bb41a0ca9b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fa0008502ec4f891bfed4a11f01650d274f95c44
\ No newline at end of file
+91969edac737adf087e35e10aa0a732b3303afd5
\ No newline at end of file

diff --git a/src/delete.c b/src/delete.c
index a9988044dd6d3485b95a10a0d5b9b92b3db32c05..03ff06a1a8b6fd8a841b241710cee90af2f5388e 100644 (file)
--- a/src/delete.c
+++ b/src/delete.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** in order to generate code for DELETE FROM statements.
 **
-** $Id: delete.c,v 1.196 2009/02/28 10:47:42 danielk1977 Exp $
+** $Id: delete.c,v 1.197 2009/03/02 14:24:21 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -181,7 +181,8 @@ Expr *sqlite3LimitWhere(
   }
 
   /* generate the SELECT expression tree. */
-  pSelect = sqlite3SelectNew(pParse,pEList,pSelectSrc,pWhere,0,0,pOrderBy,0,pLimit,pOffset);
+  pSelect = sqlite3SelectNew(pParse,pEList,pSelectSrc,pWhere,0,0,
+                             pOrderBy,0,pLimit,pOffset);
   if( pSelect == 0 ) return 0;
 
   /* now generate the new WHERE rowid IN clause for the DELETE/UDPATE */
@@ -190,7 +191,8 @@ Expr *sqlite3LimitWhere(
   pInClause = sqlite3PExpr(pParse, TK_IN, pWhereRowid, 0, 0);
   if( pInClause == 0 ) goto limit_where_cleanup_1;
 
-  pInClause->pSelect = pSelect;
+  pInClause->x.pSelect = pSelect;
+  pInClause->flags |= EP_xIsSelect;
   sqlite3ExprSetHeight(pParse, pInClause);
   return pInClause;