Two branches associated with memdb are now always taken (I believe). Tag

them with ALWAYS() to verify this.

FossilOrigin-Name: 20b9b5aa4fa6136059cf1123f00d86cb7bd8fb0f0f86f971e9714f22725e60b5

diff --git a/manifest b/manifest
index 541ab394be041c5f1f971ae944e32dbb8796825c..1f56d7368a2aff54b29d998eb2a2aeee166ea5e8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthe\sdatabase\sencoding\scannot\sbe\schanged\swhile\sthere\sare\sstatements\srunning.\sAnd\sthat\sthe\sconnection\sis\sleft\sin\sa\svalid\sstate\safter\san\sobscure\sOOM\swithin\ssqlite3_deserialize().
-D 2023-01-20T17:50:24.299
+C Two\sbranches\sassociated\swith\smemdb\sare\snow\salways\staken\s(I\sbelieve).\s\sTag\nthem\swith\sALWAYS()\sto\sverify\sthis.
+D 2023-01-20T19:19:24.597
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -554,7 +554,7 @@ F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F sqlite_cfg.h.in baf2e409c63d4e7a765e17769b6ff17c5a82bbd9cbf1e284fd2e4cefaff3fcf2
 F src/alter.c 3ca2f449c890f8b86ec9e06f0c4fccf0648941c3308a16904cb2852227db83f7
 F src/analyze.c d2fce73f6a024897593012c6ca25368629fa4aeb49960d88a52fac664582e483
-F src/attach.c 979be822b989ab3a04015577ffaa0ee88d2421cea0031d8e96d8a27399258ba4
+F src/attach.c 4deb0cdb9077f48a341be4b05f06ce3c6e7d173c1a58b22205a922e5093294d5
 F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
@@ -2043,8 +2043,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 b869054acb8f171cbc16808eb87be85e6e38d5c5670522ff4e49aef92250d5b2
-R bedf2c0681c383cf83b3cfc6ba7be674
-U dan
-Z c27c58ba1965eaaf7cdb3247e248ce17
+P a02da71f3a80dd8e817e89cdaa775c95e38c90d2471f8fec516bed086539e2c0
+R bf07522ded69fabebaa5b325f6b73b2b
+U drh
+Z e4cafc4e045b3b49d125bdbd66067c68
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 7d618f72506f86e9f67662ac61c0ce591b4b5a7c..077c1fe317636a96798635ad31213a01503ebb63 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a02da71f3a80dd8e817e89cdaa775c95e38c90d2471f8fec516bed086539e2c0
\ No newline at end of file
+20b9b5aa4fa6136059cf1123f00d86cb7bd8fb0f0f86f971e9714f22725e60b5
\ No newline at end of file

diff --git a/src/attach.c b/src/attach.c
index 917fcad674b92080dcb9c65245fc3540966558a9..ae19adb896a42b7d7ff06553c6524ebb61f1fe68 100644 (file)
--- a/src/attach.c
+++ b/src/attach.c
@@ -116,7 +116,7 @@ static void attachFunc(
         ** Close the old db and update the aDb[] slot with the new memdb
         ** values.  */
         pNew = &db->aDb[db->init.iDb];
-        if( pNew->pBt ) sqlite3BtreeClose(pNew->pBt);
+        if( ALWAYS(pNew->pBt) ) sqlite3BtreeClose(pNew->pBt);
         pNew->pBt = pNewBt;
         pNew->pSchema = pNewSchema;
       }else{
@@ -237,7 +237,7 @@ static void attachFunc(
   }
 #endif
   if( rc ){
-    if( !REOPEN_AS_MEMDB(db) ){
+    if( ALWAYS(!REOPEN_AS_MEMDB(db)) ){
       int iDb = db->nDb - 1;
       assert( iDb>=2 );
       if( db->aDb[iDb].pBt ){