From 996e3306131d427ba40d13167e9f8f3b24b130c7 Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 3 Jun 2020 22:57:15 +0000 Subject: [PATCH] Fix for ticket [810dc8038872e212]. FossilOrigin-Name: 9cfefef591dc555e41fe267e5a5b128f82038d01f8c44480ede16be4a923863f --- manifest | 16 +++++++--------- manifest.uuid | 2 +- src/vdbe.c | 2 ++ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 1c5fc1272e..d37b8f3d04 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Version\snumber\sto\s3.32.2 -D 2020-06-03T22:47:05.332 +C Fix\sfor\sticket\s[810dc8038872e212]. +D 2020-06-03T22:57:15.542 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -605,7 +605,7 @@ F src/upsert.c 2920de71b20f04fe25eb00b655d086f0ba60ea133c59d7fa3325c49838818e78 F src/utf.c d7a61c1dfdac3eb091d43341a674032dca5a34e122f78ef0b5bd2d5a31967dde F src/util.c 3b6cedf7a0c69bd6e1acce832873952d416212d6293b18d03064e07d7a9b5118 F src/vacuum.c de9780b89fa4ee74c3534f60b94820e3179aca759ffc1338ee53cb4ea7693dd3 -F src/vdbe.c e3dba0dee25bc92e871c13cac655260912b3be4abcc85b439259c9934b208da3 +F src/vdbe.c 133ee3a0d8c877416cbe66c7f21c2e5b1a46a8547981b8d93171537c88ffda17 F src/vdbe.h 07b8c636a87df8b6e58f29d6badd7f10d5844353deff1d7c88ed1c2bfe3bbd35 F src/vdbeInt.h 571413068b5ac07e2ed8ca7a02fa529622fd5455ae6981498376e5e492d2e5ef F src/vdbeapi.c e467b75a710ea099f8d2d022abf601d2ccd05e28f63b44b12d93000b6a75f4a8 @@ -1866,10 +1866,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 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba83350 -R aadbf991f37d9facfc5d1514e0c9a4b1 -T *branch * branch-3.32 -T *sym-branch-3.32 * -T -sym-trunk * +P 4454b27fc594c2600a2d5aa9f421f2e1e4c3017dda828c071b3ccb11ff46d6d5 +Q +89af93d77fa7959a4ee7364bae6c02c40963a3cdf80b0a4a8af9c9764d5c7bb5 +R 6aa42dcffed4a96d974d4a71a5dcf630 U drh -Z e782a9f5396a21b4ae4f833fd08f2a37 +Z e85c8beede2eeac241c270d59ed2bd3f diff --git a/manifest.uuid b/manifest.uuid index 1d68a32f08..0af675b4b2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4454b27fc594c2600a2d5aa9f421f2e1e4c3017dda828c071b3ccb11ff46d6d5 \ No newline at end of file +9cfefef591dc555e41fe267e5a5b128f82038d01f8c44480ede16be4a923863f \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index ce96439d1e..1c19abe951 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -702,6 +702,8 @@ int sqlite3VdbeExec( goto no_mem; } assert( p->rc==SQLITE_OK || (p->rc&0xff)==SQLITE_BUSY ); + testcase( p->rc!=SQLITE_OK ); + p->rc = SQLITE_OK; assert( p->bIsReader || p->readOnly!=0 ); p->iCurrentTime = 0; assert( p->explain==0 ); -- 2.47.2