diff options
| -rw-r--r-- | manifest | 12 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/vdbe.c | 6 |
3 files changed, 12 insertions, 8 deletions
@@ -1,5 +1,5 @@ -C Remove\san\sassert()\sin\sthe\scode\sgenerator\sthat\scan\sfail\sdue\sto\san\sinvalid\nINSERT\sstatement.\s\sThe\ssame\sassert()\sappears\sagain\sin\sthe\sVDBE\sand\swill\sfire\nthere\sif\sthe\sproblem\spersists\sin\san\sSQL\sstatement\sthat\sdoes\snot\scontain\nerrors.\s\sGramfuzz\sfind. -D 2019-12-18T01:31:21.798 +C Correctly\sunwind\sthe\ssavepoint\sstack\sif\sthe\sdatabase\sgoes\sread-only\sin\nthe\smiddle\sof\sa\ssavepoint. +D 2019-12-18T02:12:04.800 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -599,7 +599,7 @@ F src/upsert.c b445315c8958d8f17ec3297d06842e61dacaad0633ccaec1e4e160de7e562212 F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507 F src/util.c 2c92bc706bbdb1c45a25180291e7e05a56e297aa5dd7b2bcd2b1c47e8bb05b17 F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf -F src/vdbe.c ed52f3e6f41a0097c96171379f668f5de26dba2a0d096e48461d2b2742056a22 +F src/vdbe.c ab3f6e647235fe4fa16b71496468313a1da435eb3a2125c3ffdbb0be0d1cbcba F src/vdbe.h fdbc0a11e5768a702b46ce63286f60e22e71351a29bd98b3666405e1fccc7802 F src/vdbeInt.h bd589b8b7273286858950717e0e1ec5c88b18af45079a3366dc1371865cea704 F src/vdbeapi.c 1252d80c548711e47a6d84dae88ed4e95d3fbb4e7bd0eaa1347299af7efddf02 @@ -1852,7 +1852,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 1ca0bd982ab1183bbafce0d260e4dceda5eb766ed2e7793374a88d1ae0bdd2ca -R 092a651653668f530eef3aa12db79af2 +P 9bdd57cb9ad8ac1f4a0f1a3942d94ca5193109eeb1975343c4f0c7abf7135946 +R b4dd25704860b1cef2883ea8b825990b U drh -Z 46ff68601fa617a2914722b9a7e1adba +Z 065de26ad77175bb3bbe46abfbcca490 diff --git a/manifest.uuid b/manifest.uuid index e6c8929e7..1e737eb21 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9bdd57cb9ad8ac1f4a0f1a3942d94ca5193109eeb1975343c4f0c7abf7135946
\ No newline at end of file +a96d02b4ab8c70cc20b322e4fa3a4b8814f05c51f5d8b071ec9d69e7379f3ea5
\ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index 45a3fb02e..33c5882bc 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -3264,8 +3264,12 @@ case OP_Savepoint: { p->rc = rc = SQLITE_BUSY; goto vdbe_return; } - db->isTransactionSavepoint = 0; rc = p->rc; + if( rc ){ + db->autoCommit = 0; + }else{ + db->isTransactionSavepoint = 0; + } }else{ int isSchemaChange; iSavepoint = db->nSavepoint - iSavepoint - 1; |