Mark a single branch as no longer reachable.

FossilOrigin-Name: 4f35b3b78a461b0617a5cd04f60d2ab277bcc7c994dae463851a3cb5d041a723

diff --git a/manifest b/manifest
index 3d0c1a64d40786f1948290be35343c0e5aa73205..b01d6fa7e73b6141929227d6af18edcb7865ec71 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\sversion\snumber\sto\s3.29\sfor\sthe\snext\sdevelopment\scycle.
-D 2019-04-19T22:01:10.982
+C Mark\sa\ssingle\sbranch\sas\sno\slonger\sreachable.
+D 2019-04-19T23:05:56.134
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -470,7 +470,7 @@ F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
 F src/dbstat.c c12833de69cb655751487d2c5a59607e36be1c58ba1f4bd536609909ad47b319
 F src/delete.c d08c9e01a2664afd12edcfa3a9c6578517e8ff8735f35509582693adbe0edeaf
-F src/expr.c 23a2a2d86e3ae932738c2209448d6cfceed6db4843e9efeac134e1dd9475b9da
+F src/expr.c f65db06a0fcff760cadfb79d579a41e3eb7eff38848d5d6359137822f4fa2ec9
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 0e14d4bef8eac2d87bbd517e492d9084c65008d117823f8922c5e7b2b599bd33
 F src/func.c 2ccf4ae12430b1ae7096be5f0675887e1bd0732828af0ac0f7496339b7c6edee
@@ -1818,7 +1818,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 0fbd154eb419b57b9c064c1f47346835d6324388b966b73f8a0122de065f08b1
-R 0cc980e0dc04d81764cc0d3f65347d88
+P 6cf16703fd4a835c249c947006ae4a4bf81873c8ca1803945453c9845f882dc1
+R ff3642bada516bde6836db167619c845
 U drh
-Z c6ca1ce47aa8677b9fa6820037fce811
+Z 2a6d21c59c4950c9897c2627e0f9536a

diff --git a/manifest.uuid b/manifest.uuid
index 54fe64b1de6dbcacc05d0a4a8459c1a3b639ce20..43ee2ab2a5bf3f578f91388d8605a6cc98804785 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6cf16703fd4a835c249c947006ae4a4bf81873c8ca1803945453c9845f882dc1
\ No newline at end of file
+4f35b3b78a461b0617a5cd04f60d2ab277bcc7c994dae463851a3cb5d041a723
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 874a044d7e905c3e0eefe3b4308fb574ba92fe6a..ca63eb66c0fc865f878760fb4cbfe6e7bc0b74fa 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -2079,7 +2079,7 @@ int sqlite3ExprContainsSubquery(Expr *p){
 */
 int sqlite3ExprIsInteger(Expr *p, int *pValue){
   int rc = 0;
-  if( p==0 ) return 0;  /* Can only happen following on OOM */
+  if( NEVER(p==0) ) return 0;  /* Used to only happen following on OOM */
 
   /* If an expression is an integer literal that fits in a signed 32-bit
   ** integer, then the EP_IntValue flag will have already been set */