Make a new branch in the SqlExec opcode reachable by tests.

FossilOrigin-Name: 023ad470b68b7c09e159244493a6d0285d706efdecd8719a71e6885509d4750c

diff --git a/manifest b/manifest
index 889a0c5c2b0c7c8f2cb50aae6a2ab9d4bcfa6c07..ccb1b3b8c35a6ec6b2d454ec4a129ece430f9709 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\san\sunreachable\sbranch\swhen\sSQLITE_ENABLE_API_ARMOR\sis\snot\sdefined.
-D 2023-10-17T18:28:27.757
+C Make\sa\snew\sbranch\sin\sthe\sSqlExec\sopcode\sreachable\sby\stests.
+D 2023-10-17T18:59:13.292
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -788,7 +788,7 @@ F src/upsert.c fa125a8d3410ce9a97b02cb50f7ae68a2476c405c76aa692d3acf6b8586e9242
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c e87f66258c37f87724f46e849572c3ece4c74ef5614ba41eb221e98f0dbc95de
 F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
-F src/vdbe.c ae873b02ade06478b217ea38d90229dff68180d7a1fe526910b0d62a0fe0595a
+F src/vdbe.c fb7697e9292e74d6b63e37349edbae5fb2116a7753f71744d41a699bd28e2d3a
 F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
 F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
 F src/vdbeapi.c fe654b1f54e1feebcaed6c2ae3ed035cc65bfeb9a1169bed866abc42bfc63ff6
@@ -2132,8 +2132,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 5781d043ffeccda03357ee530564987443dc1deb6111a4028701b4a98fdfe16d
-R 513dac248a540d96596079e13af2bfae
+P 5f8b807b568f4f9ec65f1c924e0e1ac2f996f405e045204145ad7116be7580ee
+R 9f71db9b261c5cdc2f29e944e28307f6
 U drh
-Z 1e907b0b1d9f5c01eabd8840863bba73
+Z 35b981188468f296d580751db3ae3f1e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a162b3813267702e242f0d30c1e5beee021d41ee..ca1349f34483b15187b2852603119f3913e690e0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5f8b807b568f4f9ec65f1c924e0e1ac2f996f405e045204145ad7116be7580ee
\ No newline at end of file
+023ad470b68b7c09e159244493a6d0285d706efdecd8719a71e6885509d4750c
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index ce094f9970c510edb7f6e6df0ee0bc08509068e3..8077d2185a50d2ecf064dec786336b0f568481a9 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -6927,7 +6927,7 @@ case OP_SqlExec: {
   db->nSqlExec--;
   db->xAuth = xAuth;
   db->mTrace = mTrace;
-  if( rc || zErr ){
+  if( zErr || rc ){
     sqlite3VdbeError(p, "%s", zErr);
     sqlite3_free(zErr);
     if( rc==SQLITE_NOMEM ) goto no_mem;