Omit errors about missing SAVEPOINTs when aborting the .archive command

in the CLI.

FossilOrigin-Name: 2a47387ba6aa3c294607b7641aa1c4cf70a7b27a861e1098c2f79a38e5b7036a

diff --git a/manifest b/manifest
index 8b7906c380570b0a33a179d0c2fa8d8d016a037d..ed09660150c259871842ff809f31794decae783d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sdetection\sof\scell\scorruption\sin\ssqlite3VdbeRecordCompareWithSkip().
-D 2019-01-11T16:44:16.395
+C Omit\serrors\sabout\smissing\sSAVEPOINTs\swhen\saborting\sthe\s.archive\scommand\nin\sthe\sCLI.
+D 2019-01-11T17:19:59.217
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 45a3fef4d325ac0220c2172aeec4e4321da351f073f3b8e8ddea655f49ef6f2b
@@ -513,7 +513,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 5f2f987aacba7548d10781f808e1b933f80abe0b6bc8e9922bc18b1d1faba339
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 4b0be1bfd2d8668e2711f877682361e06b412c53ce7a56303f1f6978ec33eca8
-F src/shell.c.in 0722a9e3a1b23674f07c194b8f71c953c775bad280e7f179a32bf72cd009b569
+F src/shell.c.in b3cd745b53439674fdc3dc4db12e094d11cff91495be68bb09ac52726084b583
 F src/sqlite.h.in b54cd42d2f3b739a00de540cafe2dcd0de3b8e1748a2db33a68def487e9e602f
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
@@ -1797,7 +1797,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 aaa3a19f8cf5ba7003634e4610abc7832354af91d7c7f65469218678f66bcd46
-R c1b2c21631b6036f54a7027eb0d2a822
+P fa47f4c6589c431cf678560ac33dea6b695052012bea2096b2c92869ed51c688
+R 254a1d7a527962cc4514f37b0edd1520
 U drh
-Z 43ceb2c15935294e45a456ae6f63de4d
+Z 38fa272dba858ffd290fec63f7de6047

diff --git a/manifest.uuid b/manifest.uuid
index 3a05c60a06de97daec25b685319769c53a1c7f9c..3dc0f9fce63d1cc405f0bbfb25b5661000de91df 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fa47f4c6589c431cf678560ac33dea6b695052012bea2096b2c92869ed51c688
\ No newline at end of file
+2a47387ba6aa3c294607b7641aa1c4cf70a7b27a861e1098c2f79a38e5b7036a
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index b468c6f79df3c5e013343fc9d1e74f876d4f7fb9..747965b0de964d492b5a4097222ebe7c96af86be 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -5749,7 +5749,7 @@ static int arCreateOrUpdateCommand(
   }
 end_ar_transaction:
   if( rc!=SQLITE_OK ){
-    arExecSql(pAr, "ROLLBACK TO ar; RELEASE ar;");
+    sqlite3_exec(pAr->db, "ROLLBACK TO ar; RELEASE ar;", 0, 0, 0);
   }else{
     rc = arExecSql(pAr, "RELEASE ar;");
     if( pAr->bZip && pAr->zFile ){