Remove a branch that became unreachable due to one of the earlier check-ins

today.

FossilOrigin-Name: fa0956edf866f48f448967836709a3ad822ff917

diff --git a/manifest b/manifest
index f9c5dae3b3c94cdd2116679eace3ab17744608b8..5fed9110dbbe3f83f68283894b9d45603a482634 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\scausing\san\sassert()\sto\sfail\sif\sa\ssnippet\scontaining\s0\stokens\swas\srequested\sfrom\sfts3.
-D 2015-04-15T08:20:50.158
+C Remove\sa\sbranch\sthat\sbecame\sunreachable\sdue\sto\sone\sof\sthe\searlier\scheck-ins\ntoday.
+D 2015-04-15T08:37:42.853
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -287,7 +287,7 @@ F src/test_vfs.c b7e6831e6fcf04c5090accff30640ec5c9630739
 F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
-F src/tokenize.c 2b93d338833be43cba93644562e85a24ff3d97d1
+F src/tokenize.c a8234a67577308935cdf13e618cd66556f5f45d1
 F src/trigger.c 69a91bed7c94e46223e37ffccfeeb35e34b999ac
 F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
 F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
@@ -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 3576973f8b88b6109fbefdebfa53468ffa137009
-R 3265dd5ed99bf273b3517690abeeedc9
-U dan
-Z a6b618f03dfa759db2c6c3b930aa2a83
+P eafd0a1e3f25f38d551603f177ff4634cf79de77
+R cd3636389f675a46c2832548029faa61
+U drh
+Z 0baf8e6f8836d6dbdde447c335370222

diff --git a/manifest.uuid b/manifest.uuid
index e0df72f85fa3edabf4ffad4d0fd58635aca62961..0fa4f22d9013e091e70af6198cef290f888cb1a4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-eafd0a1e3f25f38d551603f177ff4634cf79de77
\ No newline at end of file
+fa0956edf866f48f448967836709a3ad822ff917
\ No newline at end of file

diff --git a/src/tokenize.c b/src/tokenize.c
index a4d20c864185817465287535b683580bd674ce13..2f8fd98ede4271c75116bbee860d05d810745e93 100644 (file)
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -449,7 +449,8 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
     }
   }
 abort_parse:
-  if( zSql[i]==0 && nErr==0 && pParse->rc==SQLITE_OK ){
+  assert( nErr==0 );
+  if( zSql[i]==0 && pParse->rc==SQLITE_OK ){
     if( lastTokenParsed!=TK_SEMI ){
       sqlite3Parser(pEngine, TK_SEMI, pParse->sLastToken, pParse);
       pParse->zTail = &zSql[i];