Remove an unnecessary branch.

FossilOrigin-Name: a33179596f534067a58d68b77160f11ab13272b29f912d7cbe15ea00bbf03ade

diff --git a/manifest b/manifest
index d89bebfd83d496c98255b88f6f12b3e62837a0aa..8040d9e1101f2fcab8cd9c33729300fcb3c25c35 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sextra\stests\sfor\sthe\soptimization\son\sthis\sbranch.
-D 2017-05-01T14:09:32.423
+C Remove\san\sunnecessary\sbranch.
+D 2017-05-01T19:53:12.478
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6a8c838220f7c00820e1fc0ac1bccaaa8e5676067e1dbfa1bafa7a4ffecf8ae6
@@ -402,7 +402,7 @@ F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c a2b839b8cfa75d154490839ee80bad3452b9810ad39862ad044d154211292866
+F src/select.c 2c7ce8872ba623c24ebe2e881c54d7f7dcd3d9a3af04b8e34db0671354082db9
 F src/shell.c 21b79c0e1b93f8e35fd7b4087d6ba438326c3d7e285d0dd51dfd741475f858a1
 F src/sqlite.h.in 40233103e3e4e10f8a63523498d0259d232e42aba478e2d3fb914799185aced6
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1578,7 +1578,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 5375a3ce56f1d993b13b469fe33ec7679948f53940f62a15ddbaeb8aaa26a22c
-R 123e296789286f2ee6ee6640a2471eff
-U dan
-Z 8431f2088d761010cb187c22f8f8d978
+P 4921cd9520080f9baff70e548f64a56e2204b398b8397a2d318a98c32ec4b00c
+R c6e750f01e8b5a0c9293dd8f991b3ffc
+U drh
+Z 3a6ca4224cd5b67f49546c5966995b4b

diff --git a/manifest.uuid b/manifest.uuid
index 2428b6a0d4a70db04882cc80fd126588849f9d1b..622d6244996a1b70ed174c18b159f9be5ce14b36 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4921cd9520080f9baff70e548f64a56e2204b398b8397a2d318a98c32ec4b00c
\ No newline at end of file
+a33179596f534067a58d68b77160f11ab13272b29f912d7cbe15ea00bbf03ade
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 7a195560e6eb1673a0d82c004f3c682c7aaed0ac..4e78a493358b97edd056291e93b22fc4e984cca8 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -4907,9 +4907,7 @@ static int havingToWhereExprCb(Walker *pWalker, Expr *pExpr){
       if( pNew ){
         Expr *pWhere = *(p->ppWhere);
         SWAP(Expr, *pNew, *pExpr);
-        if( pWhere ){
-          pNew = sqlite3ExprAnd(db, pWhere, pNew);
-        }
+        pNew = sqlite3ExprAnd(db, pWhere, pNew);
         *(p->ppWhere) = pNew;
       }
     }