Another very minor tweak to code on this branch to save cycles.

FossilOrigin-Name: 2c805dc68112db7f06aea56a731a33e046e876851bdda3e725ba96f6da1bf2ee

diff --git a/manifest b/manifest
index 48bc490800fb3195b04bc53a76aff42b8ac34783..f85f89e2453bc876ea1fa08c9e91e428589ffbf5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sorder\sof\san\sif..else...\sin\snew\scode\sto\smake\sit\sslightly\sfaster.
-D 2023-09-25T15:25:49.739
+C Another\svery\sminor\stweak\sto\scode\son\sthis\sbranch\sto\ssave\scycles.
+D 2023-09-25T17:21:53.474
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -705,7 +705,7 @@ F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00
 F src/pragma.c ea85fb64b9481004aaa5d0fa66a57c804074f46145ef2409894d1fc2f4b0cf8d
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
-F src/prepare.c 80548297dc0e1fb3139cdebffb5a1bcac3dfac66d791012dd74838e70445072d
+F src/prepare.c bde74add20fc0e8ce0c4e937a1f70a36d17413afe4f71d3e103f5cb74b17c8d9
 F src/printf.c e3ba080e2f409f9bfcc8d34724e6fc160e9c718dc92d0548f6b71b8b6f860ce2
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 0c3046b88901336709cd09f474303a16fc54bce13a2befcab66d0fa6b44ca869
@@ -795,7 +795,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 01e051a1e713d9eabdb25df38602837cec8f4c2cae448ce2cf6accc87af903e9
 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
 F src/walker.c 7c7ea0115345851c3da4e04e2e239a29983b61fb5b038b94eede6aba462640e2
-F src/where.c ad7c28cabdceb78c4d8e961b58edcaff9b2586293bc35be1e5ad1784eb60a514
+F src/where.c 8e4f2d16c6fe0f6e6905876096298bc25bf5405e9c937f2c5c4120d519253d71
 F src/whereInt.h 4b38c5889514e3aead3f27d0ee9a26e47c3f150efc59e2a8b4e3bc8835e4d7a1
 F src/wherecode.c 5d77db30a2a3dd532492ae882de114edba2fae672622056b1c7fd61f5917a8f1
 F src/whereexpr.c dc5096eca5ed503999be3bdee8a90c51361289a678d396a220912e9cb73b3c00
@@ -2122,8 +2122,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5775f92b31f0539c66d37e50689bec17a82c0e857a781331c03e34bc18157087
-R c969129a74f57eba1e4e7e018a6ec36d
+P f80dc64483a54a488e507da140836261ae1b864577cc95d8e869919d5a25e73c
+R 59ae5630a4db4ae46ec6891560befc86
 U dan
-Z 81e4a295f7c75bcb58999b0aeee339df
+Z 8b429c87204b6a5d38a57baa10ce58aa
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 2b05ae160843348a39a12f1772d16a41e02b51de..4fb2645b3c403b78168043a9b488b93e51cf6bed 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f80dc64483a54a488e507da140836261ae1b864577cc95d8e869919d5a25e73c
\ No newline at end of file
+2c805dc68112db7f06aea56a731a33e046e876851bdda3e725ba96f6da1bf2ee
\ No newline at end of file

diff --git a/src/prepare.c b/src/prepare.c
index 9f843faa860295a20cbc0114f5f73a61ed1b5d24..d3e134e764721e5db972bb8cdb8f60b54d2e1a49 100644 (file)
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -598,8 +598,6 @@ void sqlite3ParseObjectReset(Parse *pParse){
   db->lookaside.sz = db->lookaside.bDisable ? 0 : db->lookaside.szTrue;
   assert( pParse->db->pParse==pParse );
   db->pParse = pParse->pOuterParse;
-  pParse->db = 0;
-  pParse->disableLookaside = 0;
 }
 
 /*

diff --git a/src/where.c b/src/where.c
index 58fdf4055a22011c8cea3ec9430a2e64ad14f9dd..b961417be592f3dfa04da51d712513bd6264ca15 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3576,7 +3576,7 @@ static void wherePartIdxExpr(
     if( aff>=SQLITE_AFF_TEXT ){
       if( pItem ){
         sqlite3 *db = pParse->db;
-        IndexedExpr *p = (IndexedExpr*)sqlite3DbMallocZero(db, sizeof(*p));
+        IndexedExpr *p = (IndexedExpr*)sqlite3DbMallocRaw(db, sizeof(*p));
         if( p ){
           int bNullRow = (pItem->fg.jointype&(JT_LEFT|JT_LTORJ))!=0;
           p->pExpr = sqlite3ExprDup(db, pRight, 0);