Remove an assert() that was made redundant by the previous checkin.

FossilOrigin-Name: 21db719156deef9fb26aff27a01e324da255c825

diff --git a/manifest b/manifest
index 217de4f2a917f474cc112e4438fd57980ff07fdb..53463be1c740bbe0b4636c52787733902f2813fe 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Add\san\sALWAYS()\saround\sa\salways-true\stest\sin\swhere.c.
-D 2011-02-17T13:33:15.650
+C Remove\san\sassert()\sthat\swas\smade\sredundant\sby\sthe\sprevious\scheckin.
+D 2011-02-17T13:52:02.520
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -244,7 +244,7 @@ F src/vtab.c b297e8fa656ab5e66244ab15680d68db0adbec30
 F src/wal.c aca10a60655e103fc8630a75345000f43c6d47ca
 F src/wal.h 7a5fbb00114b7f2cd40c7e1003d4c41ce9d26840
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
-F src/where.c 259a727427193c3406129bcb7920841252281451
+F src/where.c bf8c0f584a2c9becb9110c37e151f9d4f73fbf7e
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 51756962d522e474338e9b2ebb26e7364d4aa125
@@ -910,14 +910,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 31fc4ba66e76876b2e7b6b2b74c07f47571938ce
-R 23e71ec97780c817f50641237bf58a7d
+P 8123283ee1a360586a1721a56b4db15718c25ee0
+R c2e67a3b57f0ef4f6dc1d1726173f5f3
 U drh
-Z e6c29c88c0f1167524f4bd1e4a5e8fb4
+Z 13686355ba31a2a089ed7148c7a6f8d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFNXSOeoxKgR168RlERAnRuAKCIWlgAx2+sDKXDMivL2Tk9PhpNawCeP2K6
-b1PCeStoUkZM7/d1Nra15g4=
-=Lq3S
+iD8DBQFNXSgFoxKgR168RlERArWeAJ0bK+urBZ9r5HzL+NNrL0hmF9MHQwCeIzql
+RqRfQKsPFfT3VO9Hh6ohUt0=
+=/pbJ
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index accebf838836b600d60dfa121821ee2aa14c4b77..56f26d3efbf07acd5f8a8d79f3e57f499406428c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8123283ee1a360586a1721a56b4db15718c25ee0
\ No newline at end of file
+21db719156deef9fb26aff27a01e324da255c825
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index b17117da49457dba925ccf3aab6379a370b4de2c..9ad2ad320253afc97bd0c4f2da5b8a7b29bff874 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -1892,7 +1892,6 @@ static void constructAutomaticIndex(
         idxCols |= cMask;
         pIdx->aiColumn[n] = pTerm->u.leftColumn;
         pColl = sqlite3BinaryCompareCollSeq(pParse, pX->pLeft, pX->pRight);
-        assert( pColl!=0 || pParse->nErr>0 );
         pIdx->azColl[n] = ALWAYS(pColl) ? pColl->zName : "BINARY";
         n++;
       }