From: drh <drh@noemail.net>
Date: Fri, 7 Jul 2017 11:49:48 +0000 (+0000)
Subject: Very slightly smaller and faster sqlite3WalkSelect().
X-Git-Tag: version-3.20.0~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3da70a6112e737aede241280882df060f6e47614;p=thirdparty%2Fsqlite.git

Very slightly smaller and faster sqlite3WalkSelect().

FossilOrigin-Name: 9bc65635b29a4991c7821ef0939975d007f9ac23716717699353ef3246e27791
---

diff --git a/manifest b/manifest
index 964137da5b..888dfa5ec4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Small\sadjustment\sto\smain.mk\sthat\sfacilitates\sgiving\snon-standard\scompile-time\noptions\sto\sthe\sshell.
-D 2017-07-06T22:43:41.021
+C Very\sslightly\ssmaller\sand\sfaster\ssqlite3WalkSelect().
+D 2017-07-07T11:49:48.109
 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 4ebb1d257cac7fb1bcb4ba59278416d410ff1c4bf59447a9c37a415f3516056a
@@ -528,7 +528,7 @@ F src/vtab.c 35b9bdc2b41de32a417141d12097bcc4e29a77ed7cdb8f836d1d2305d946b61b
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
 F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
-F src/walker.c d46044e7a5842560dfe7122d93ff5145dd4a96f4d0bf5ba5910a7731b8c01e79
+F src/walker.c 8fa7438b9068a19b33d358d6b30be62e417e888214cb9d686e32176dc6942c38
 F src/where.c e7cc80943459ade4ccaeb5c7c10f8a0db8b797e0b0f2509de7efc557b76bf7b6
 F src/whereInt.h 2a4b634d63ce488b46d4b0da8f2eaa8f9aeab202bc25ef76f007de5e3fba1f20
 F src/wherecode.c f17f5d51e372168db51af637e265aa5e80f99fcc81bfead96b66e71a7732bc62
@@ -1628,7 +1628,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 c5ed5ebdf660501fde7cc8aefaaaeae2a68e5899a64ac93f26684842a235281d
-R 6da9681a8300122608feae7ebbab4f3b
+P 7c7d53a9bbc27fde2dcc028cb7765c76cad0a784e53095b652c90d371968c53d
+R 11c8cbc2a5387dcf85eec229cbb392a6
 U drh
-Z d8379145f29f5d92b4d9b65e1352aa6d
+Z 97ecd3b102419405784f5c0503e71057
diff --git a/manifest.uuid b/manifest.uuid
index 3fae0fd438..6597580313 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7c7d53a9bbc27fde2dcc028cb7765c76cad0a784e53095b652c90d371968c53d
\ No newline at end of file
+9bc65635b29a4991c7821ef0939975d007f9ac23716717699353ef3246e27791
\ No newline at end of file
diff --git a/src/walker.c b/src/walker.c
index dc874a259d..0e3c14844e 100644
--- a/src/walker.c
+++ b/src/walker.c
@@ -104,7 +104,7 @@ int sqlite3WalkSelectFrom(Walker *pWalker, Select *p){
   pSrc = p->pSrc;
   if( ALWAYS(pSrc) ){
     for(i=pSrc->nSrc, pItem=pSrc->a; i>0; i--, pItem++){
-      if( sqlite3WalkSelect(pWalker, pItem->pSelect) ){
+      if( pItem->pSelect && sqlite3WalkSelect(pWalker, pItem->pSelect) ){
         return WRC_Abort;
       }
       if( pItem->fg.isTabFunc
@@ -136,7 +136,8 @@ int sqlite3WalkSelectFrom(Walker *pWalker, Select *p){
 */
 int sqlite3WalkSelect(Walker *pWalker, Select *p){
   int rc;
-  if( p==0 || pWalker->xSelectCallback==0 ) return WRC_Continue;
+  if( p==0 ) return WRC_Continue;
+  if( pWalker->xSelectCallback==0 ) return WRC_Continue;
   do{
     rc = pWalker->xSelectCallback(pWalker, p);
     if( rc ) return rc & WRC_Abort;