Remove an unreachable branch.

FossilOrigin-Name: 4c976f171342ba2d39779279c28f3bc088572c440922e3e4421a3bf541263360

diff --git a/manifest b/manifest
index 6272a5d9ea138adebc132fe5ef0fc8a8d8b92c88..2ab0ee5d3221a5a4ea00e1a42ce568f91fd2e378 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sassert()\sin\svdbemem.c\sthat\scould\sfire\sif\sthe\sdatabase\swas\scorrupt.
-D 2019-01-23T20:31:56.371
+C Remove\san\sunreachable\sbranch.
+D 2019-01-24T04:44:54.947
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0e7c107ebcaff26681bc5bcf017557db85aa828d6f7fd652d748b7a78072c298
@@ -598,7 +598,7 @@ F src/vtab.c 70188a745dc4e57d26e942681ff4b2912b7c8249ad5de3f60f0677b4337bcfaa
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 3f4f653daf234fe713edbcbca3fec2350417d159d28801feabc702a22c4e213f
 F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
-F src/walker.c ec63d6e2857a542523bcc1472e9817c4da003f4c450ea4885f6e41b4b577a64a
+F src/walker.c 7607f1a68130c028255d8d56094ea602fc402c79e1e35a46e6282849d90d5fe4
 F src/where.c c5d201699d03be61c35bc04b96e481b1c8dc68177617ca1db156ef7409da2fae
 F src/whereInt.h 5f14db426ca46a83eabab1ae9aa6d4b8f27504ad35b64c290916289b1ddb2e88
 F src/wherecode.c 89d2ec668aec884dfa7ac500c6744e42ec0590fcd72fb740a8b48326a8412811
@@ -1802,7 +1802,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2ca6b8f84ec07e313aa4e1c0894827401b418dcc4221e9c54c384f1c3893952a
-R e8fdc8836590ceb99c45f46a404f58f1
-U dan
-Z f16217977338f606c6b57b218fc2ad12
+P a70958cd7d5cf750c293537856918e5789013b70f6a827f724d83559b38629c8
+R 325ad37749432671fa3f84ec38afb2d4
+U drh
+Z ccb753204103f489ac3e8af31c380337

diff --git a/manifest.uuid b/manifest.uuid
index 47f7724e21633885d9016b3dd1e150c7fed76e0a..12f129f17576cdc5d29f9c79acddeaae9fb3e204 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a70958cd7d5cf750c293537856918e5789013b70f6a827f724d83559b38629c8
\ No newline at end of file
+4c976f171342ba2d39779279c28f3bc088572c440922e3e4421a3bf541263360
\ No newline at end of file

diff --git a/src/walker.c b/src/walker.c
index 4950c8d4b0e9c17a5e85880e4f1693216f20eaf0..eff35852506a3f29ce4196e6de64deef9762fa79 100644 (file)
--- a/src/walker.c
+++ b/src/walker.c
@@ -116,7 +116,9 @@ int sqlite3WalkSelectExpr(Walker *pWalker, Select *p){
   {
     Parse *pParse = pWalker->pParse;
     if( pParse && IN_RENAME_OBJECT ){
-      if( walkWindowList(pWalker, p->pWinDefn) ) return WRC_Abort;
+      int rc = walkWindowList(pWalker, p->pWinDefn);
+      assert( rc==WRC_Continue );
+      return rc;
     }
   }
 #endif