Remove an incorrect and pointless assert().

FossilOrigin-Name: 8c3929bd42ff9c041df341aced5b7dbc0f563506

diff --git a/manifest b/manifest
index d70b8c3133c9e2f75cbe9913834f166db47b2c69..9ce9c0096d13ca66c59174c8107f2b2f74cf836f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\sassert()\schanges\sremoved\sin\sthe\sprevious\scheck-in\sare\sneeded\safter\sall.
-D 2015-05-24T21:46:03.216
+C Remove\san\sincorrect\sand\spointless\sassert().
+D 2015-05-25T09:33:48.801
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -250,7 +250,7 @@ F src/printf.c 13ce37e5574f9b0682fa86dbcf9faf76b9d82a15
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c 99eabf7eff0bfa65b75939b46caa82e2b2133f28
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
-F src/select.c 6adad8d698a382f83009eed7b73080273fa993ca
+F src/select.c 9d9f6975bb538cafc5d4ae4a45565f15f5d296ff
 F src/shell.c 07dda7cd692911d2f22269953418d049f2e2c0ee
 F src/sqlite.h.in 4d0ecd8e1e0272d9a2742b39602f5e4fad8d3246
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
@@ -1278,7 +1278,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 bf7bb53ee2485a5342916d514d6c7291eb84c5f1
-R 5e364b393c6eb63740625ffdfee0a54c
+P 336fccc84cd7b770c9c3720efc9976269096232e
+R e6209457c074a6729d7b05e89be47ecb
 U drh
-Z 28bcb31cd760dbdf61ef36939d443ca6
+Z 95520a7699ed285b4b256a5657988e91

diff --git a/manifest.uuid b/manifest.uuid
index 89894fef02338cc3108bf00e2aede59a6d6e2a04..039546bf553f542fa5c5ea7690e302ff84308ef3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-336fccc84cd7b770c9c3720efc9976269096232e
\ No newline at end of file
+8c3929bd42ff9c041df341aced5b7dbc0f563506
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 8fc2dbde3d11096ca3ee30a5dda83d26c27bf290..5626bb070ff5d7033a1a27146666dc0de25f61f6 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -4236,13 +4236,6 @@ static int selectExpander(Walker *pWalker, Select *p){
     int longNames = (flags & SQLITE_FullColNames)!=0
                       && (flags & SQLITE_ShortColNames)==0;
 
-    /* When processing FROM-clause subqueries, it is always the case
-    ** that full_column_names=OFF and short_column_names=ON.  The
-    ** sqlite3ResultSetOfSelect() routine makes it so. */
-    assert( (p->selFlags & SF_NestedFrom)==0
-          || ((flags & SQLITE_FullColNames)==0 &&
-              (flags & SQLITE_ShortColNames)!=0) );
-
     for(k=0; k<pEList->nExpr; k++){
       pE = a[k].pExpr;
       pRight = pE->pRight;