Minor fixes to requirements marks.

FossilOrigin-Name: 02ebc60b9bbc1736f4989eb56f8d31ca97fe90c930841d10986c618381ceb8b4

diff --git a/manifest b/manifest
index 59ff363f701a3002f6ba5163834ac45dd621cf09..19a82271b3fe0be7e0d555340d98a11abbd15789 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\scases\sto\simprove\scoverage\sof\sVDBE\sbranches.\sStill\ssome\sto\sgo.
-D 2019-04-04T17:58:34.623
+C Minor\sfixes\sto\srequirements\smarks.
+D 2019-04-04T18:20:25.455
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -588,7 +588,7 @@ F src/update.c 0b973357d88092140531e07ff641139c26fb4380b0b9f5ed98c5f7691b4604d1
 F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
 F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
 F src/util.c 82a2e3f691a3b654be872e305dab1f455e565dedf5e6a90c818c1ab307c00432
-F src/vacuum.c d07bc4025836ad3ff298a738270bce9411dd39cbd8a2d4bb87d7a94e54526878
+F src/vacuum.c 72690ccb6877a88f8473a893cf9f6d7592236f3eebfebfa840b19c708acde574
 F src/vdbe.c 711ef421b3bb3db3b2476067b2dc3c71ef5844d9b1a723026578f89f6da621e8
 F src/vdbe.h 712bca562eaed1c25506b9faf9680bdc75fc42e2f4a1cd518d883fa79c7a4237
 F src/vdbeInt.h d0c78ec6ba57e438164c46ee8129ee00ccd898c472b27e325c9758eda533e37e
@@ -825,7 +825,7 @@ F test/e_select2.test aceb80ab927d46fba5ce7586ebabf23e2bb0604f
 F test/e_totalchanges.test b12ee5809d3e63aeb83238dd501a7bca7fd72c10
 F test/e_update.test f46c2554d915c9197548681e8d8c33a267e84528
 F test/e_uri.test 47eeb2960e74613f0f8722b2f13aef08fde69daa16e5380ac93df84dac8b1f72
-F test/e_vacuum.test 819f46653b2361b93c10556148bd99650ab61dc4047bd92ac98da99ce311c773
+F test/e_vacuum.test 0d8832a2ce92350db0d0cff47b419465fd9772562e1f77ff7d9478c07a4980d2
 F test/e_wal.test ae9a593207a77d711443ee69ffe081fda9243625
 F test/e_walauto.test 248af31e73c98df23476a22bdb815524c9dc3ba8
 F test/e_walckpt.test 28c371a6bb5e5fe7f31679c1df1763a19d19e8a0
@@ -1815,7 +1815,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 4fca46ded7873d4939d7c6bff363ded41667f2255a4ab624a1a24bebbae733eb
-R e06dd790728cfb4840c24aea722adf87
-U dan
-Z f435b81a4b15ca0f8af2ad1bdda4d9cc
+P 4cef609d61de272cfdc2b39e1d49c7cd56ec834086bd63095116ff98f4d402bd
+R 22d62c84939f971f6f6db11942d96a93
+U drh
+Z 93194a4af392a920c3f42afd9763d0e1

diff --git a/manifest.uuid b/manifest.uuid
index 88e7af3a34092baa803462563e6b2b91c154d901..8879d17e75672d685804055c8cad5826f02214df 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4cef609d61de272cfdc2b39e1d49c7cd56ec834086bd63095116ff98f4d402bd
\ No newline at end of file
+02ebc60b9bbc1736f4989eb56f8d31ca97fe90c930841d10986c618381ceb8b4
\ No newline at end of file

diff --git a/src/vacuum.c b/src/vacuum.c
index 1c9164c85d161bdfef96590a4706e875dd6f1668..74e6d7df378e98622caaae2578b8465e9249e152 100644 (file)
--- a/src/vacuum.c
+++ b/src/vacuum.c
@@ -163,11 +163,11 @@ SQLITE_NOINLINE int sqlite3RunVacuum(
 
   if( !db->autoCommit ){
     sqlite3SetString(pzErrMsg, db, "cannot VACUUM from within a transaction");
-    return SQLITE_ERROR;
+    return SQLITE_ERROR; /* IMP: R-12218-18073 */
   }
   if( db->nVdbeActive>1 ){
     sqlite3SetString(pzErrMsg, db,"cannot VACUUM - SQL statements in progress");
-    return SQLITE_ERROR;
+    return SQLITE_ERROR; /* IMP: R-15610-35227 */
   }
   saved_openFlags = db->openFlags;
   if( pOut ){

diff --git a/test/e_vacuum.test b/test/e_vacuum.test
index de4773b91c8b67dc56a85b24c7e803fe39ec3365..cfe7f8464fee1d47501bad1a6bdf3520480c93d9 100644 (file)
--- a/test/e_vacuum.test
+++ b/test/e_vacuum.test
@@ -286,9 +286,9 @@ do_execsql_test e_vacuum-3.1.8 {
   SELECT rowid, x FROM t5;
 } {1 x 3 z}
 
-# EVIDENCE-OF: R-49563-33883 A VACUUM will fail if there is an open
-# transaction, or if there are one or more active SQL statements when it
-# is run.
+# EVIDENCE-OF: R-12218-18073 A VACUUM will fail if there is an open
+# transaction on the database connection that is attempting to run the
+# VACUUM.
 #
 do_execsql_test  e_vacuum-3.2.1.1 { BEGIN } {}
 do_catchsql_test e_vacuum-3.2.1.2 {