Remove two pointless assert() statements. This should silence harmless

compiler warnings reported at
[https://bugzilla.mozilla.org/show_bug.cgi?id=1152845]

FossilOrigin-Name: 83b342a44ffc9ea07dc4d59f2866cefc68ee4f13

diff --git a/manifest b/manifest
index f4f4fa2b8853f1a6b3fdc2d63164f77bfaa10867..a4817bdb6cf81b912ed3a21b83036e05dac1ebd9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\scomment\stypos\sin\sthe\ssqldiff.c\sutility\sprogram.
-D 2015-04-09T13:40:18.767
+C Remove\stwo\spointless\sassert()\sstatements.\s\sThis\sshould\ssilence\sharmless\ncompiler\swarnings\sreported\sat\s\n[https://bugzilla.mozilla.org/show_bug.cgi?id=1152845]
+D 2015-04-09T16:30:56.502
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -176,7 +176,7 @@ F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
 F src/btree.c 2caf598165f3608fde8abac2b243826616ce54b7
 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
-F src/build.c 0419bba592c22f6d00e6d57a2ca7136720d02c1a
+F src/build.c 4a6d573cd5f77812f32d343134b429046946d560
 F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
 F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575
 F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
@@ -288,7 +288,7 @@ F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
 F src/tokenize.c a8d270b06e5f709930f7b67cf70a847969cb5bf3
-F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
+F src/trigger.c 69a91bed7c94e46223e37ffccfeeb35e34b999ac
 F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
 F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
 F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
@@ -1250,7 +1250,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 88da5bf5d2c4f848dbd4b5ffb1539abfbbdaff18
-R df929ff4fd13763291be7acc0214ee00
+P 32ab2bb990746a84f5944e3cf428fb2dff3628da
+R 37f01a89c55b4805b0a5cf101a377c7c
 U drh
-Z 41493ba4ef878730b46175333abd9329
+Z 80169060600c5dd4d547a3dab7f7d969

diff --git a/manifest.uuid b/manifest.uuid
index 91e566d27067188984767310509d34750a992478..341851e55fe0219653981ec28dd9bcfa13746fde 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-32ab2bb990746a84f5944e3cf428fb2dff3628da
\ No newline at end of file
+83b342a44ffc9ea07dc4d59f2866cefc68ee4f13
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index fcf96bd42c120a2fc59f27001b6ea3c7d84af41e..e01e2427f12a407af6e613a63e705481d3f62e96 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -3776,7 +3776,6 @@ void sqlite3SrcListIndexedBy(Parse *pParse, SrcList *p, Token *pIndexedBy){
 void sqlite3SrcListShiftJoinType(SrcList *p){
   if( p ){
     int i;
-    assert( p->a || p->nSrc==0 );
     for(i=p->nSrc-1; i>0; i--){
       p->a[i].jointype = p->a[i-1].jointype;
     }

diff --git a/src/trigger.c b/src/trigger.c
index d2e7b5a1e6580b0b1be26ac5278dfad763b10fd0..ed152d2a8ae0c1128bae7ded94fa532649a15eae 100644 (file)
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -680,7 +680,6 @@ static SrcList *targetSrcList(
   pSrc = sqlite3SrcListAppend(pParse->db, 0, &pStep->target, 0);
   if( pSrc ){
     assert( pSrc->nSrc>0 );
-    assert( pSrc->a!=0 );
     iDb = sqlite3SchemaToIndex(pParse->db, pStep->pTrig->pSchema);
     if( iDb==0 || iDb>=2 ){
       sqlite3 *db = pParse->db;