Fix a faulty assert() in the DELETE code generator.

FossilOrigin-Name: 95f8ebdbf87326f23cd38e561ac5632b5367a449

diff --git a/manifest b/manifest
index 4d085dbcbca2fb5c017468858d9e4108e04ba973..a6054c1a60123c0b368808c360ec5db5136e9522 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Trivial\ssimplification\sto\sthe\sautomatic\sindex\slogic.
-D 2014-10-28T15:58:50.607
+C Fix\sa\sfaulty\sassert()\sin\sthe\sDELETE\scode\sgenerator.
+D 2014-10-28T16:19:18.944
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -180,7 +180,7 @@ F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
 F src/complete.c c4ba6e0626bb94bc77a0861735f3382fcf7cc818
 F src/ctime.c df19848891c8a553c80e6f5a035e768280952d1a
 F src/date.c 57a7f9ba9f6b4d5268f5e411739066a611f99036
-F src/delete.c fae81cc2eb14b75267d4f47d3cfc9ae02aae726f
+F src/delete.c 0750b1eb4d96cd3fb2c798599a3a7c85e92f1417
 F src/expr.c 0391a657df4959eaf2a2fd7d77de5ebe750686ee
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
@@ -1207,7 +1207,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 1a7e711ed10860c7985e84b97cdfff748d940b9f
-R b0011529707271df74d0fa481aad6091
+P 23073a053931de324323f631a6613086786af411
+R 5f4e1ea821e16c5044076b23f1aebe8a
 U drh
-Z ab603a6740e2096395006a3b0e96e405
+Z 478016a63ef8d014d3b6d95929bf74df

diff --git a/manifest.uuid b/manifest.uuid
index 39c8a652a597b03f0bdde038b3af606451b17b94..49ec9c59700161cf0ba43f0f18d54a135c218773 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-23073a053931de324323f631a6613086786af411
\ No newline at end of file
+95f8ebdbf87326f23cd38e561ac5632b5367a449
\ No newline at end of file

diff --git a/src/delete.c b/src/delete.c
index b97407400b2d587dcde768452f621da9c1fe6ec2..d81dd3f6b48d8eab35a073dcceedbd8b1555550a 100644 (file)
--- a/src/delete.c
+++ b/src/delete.c
@@ -481,7 +481,7 @@ void sqlite3DeleteFrom(
       assert( nKey==nPk );  /* OP_Found will use an unpacked key */
       assert( !IsVirtual(pTab) );
       if( aToOpen[iDataCur-iTabCur] ){
-        assert( pPk!=0 );
+        assert( pPk!=0 || pTab->pSelect!=0 );
         sqlite3VdbeAddOp4Int(v, OP_NotFound, iDataCur, addrBypass, iKey, nKey);
         VdbeCoverage(v);
       }