From: drh <>
Date: Fri, 29 Oct 2021 16:19:03 +0000 (+0000)
Subject: Reorder a test add earlier today to OP_Transaction for easier testing.
X-Git-Tag: version-3.37.0~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4e1af5efb91767192cd440ebd7ec7999f6751f4;p=thirdparty%2Fsqlite.git

Reorder a test add earlier today to OP_Transaction for easier testing.

FossilOrigin-Name: 8ba73b3cadb72ffcf176d19f9f946c1b90b224e5ab9a0e9eb9a83affa7476d23
---

diff --git a/manifest b/manifest
index db89ae7616..c36252731a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\s"VACUUM\sINTO"\sto\schange\sthe\spage_size\sof\sa\sdatabase\seven\sif\sthe\noriginal\sdatabase\sis\sin\sWAL\smode.\s\sEnhancement\ssuggested\sby\n[forum:/forumpost/033f2c9d1f|forum\spost\s033f2c9d1f].
-D 2021-10-29T13:10:02.528
+C Reorder\sa\stest\sadd\searlier\stoday\sto\sOP_Transaction\sfor\seasier\stesting.
+D 2021-10-29T16:19:03.333
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -621,7 +621,7 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 30df8356e231dad33be10bb27897655002668343280004ba28c734489414a167
 F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
-F src/vdbe.c daa876fbf9331a8b776696903877353bc352c9e30f5260c465386f2b29dfc4cf
+F src/vdbe.c 54089e5ebb02d35e52d6b3d51061b79b8923c70e839df4ca4ff7bd9bcb9b9708
 F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 F src/vdbeInt.h 38206c8dd6b60ff03d9fd4f626b1b4fd0eef7cdc44f2fc2c1973b0f932a3f26b
 F src/vdbeapi.c 7b83468feb1d42a09d4c2e5241a3eaa3d1f138e289a843cba9fd3f1dad95ca67
@@ -1929,7 +1929,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 39c5e80dbf94ac3079b3e0c2c3e6608ac366e3f3de3cea4f4947addc3f52bc36
-R d68f81b39f86cb06b4a36b68798fdf37
+P efc7e8c99a86e9d9eb81655ce96353847bd2cca64eb8f8d10e297f6f4d38e563
+R 946767be3c5aa505f601226a0027015d
 U drh
-Z df8c8b91d90a62fffcb8772ebdcbd4b6
+Z 818395ff90b7bf4ecce02cad13dcc7aa
diff --git a/manifest.uuid b/manifest.uuid
index 2db762f867..d2580d16cd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-efc7e8c99a86e9d9eb81655ce96353847bd2cca64eb8f8d10e297f6f4d38e563
\ No newline at end of file
+8ba73b3cadb72ffcf176d19f9f946c1b90b224e5ab9a0e9eb9a83affa7476d23
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index e1f3fe4c63..2b06eea91e 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -3700,10 +3700,10 @@ case OP_Transaction: {
     }
   }
   assert( pOp->p5==0 || pOp->p4type==P4_INT32 );
-  if( pOp->p5
+  if( rc==SQLITE_OK
+   && pOp->p5
    && (iMeta!=pOp->p3
       || db->aDb[pOp->p1].pSchema->iGeneration!=pOp->p4.i)
-   && rc==SQLITE_OK
   ){
     /*
     ** IMPLEMENTATION-OF: R-03189-51135 As each SQL statement runs, the schema