From: drh <drh@noemail.net>
Date: Thu, 24 Mar 2016 15:32:19 +0000 (+0000)
Subject: Larger margins for one memsubsys1 range check when running with a
X-Git-Tag: version-3.12.0~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d38a2e2511daf120d37c58c95e333e29bdb7f3a4;p=thirdparty%2Fsqlite.git

Larger margins for one memsubsys1 range check when running with a
non-zero reserved-bytes value.

FossilOrigin-Name: 6db1d1fbc6c1acc896fa635dfdc5564800502c40
---

diff --git a/manifest b/manifest
index 19ae78878e..63d4b9b8b2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\stest\sscripts\sso\sthat\sthey\swork\swith\svarious\spermutations.
-D 2016-03-24T15:09:14.368
+C Larger\smargins\sfor\sone\smemsubsys1\srange\scheck\swhen\srunning\swith\sa\nnon-zero\sreserved-bytes\svalue.
+D 2016-03-24T15:32:19.097
 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@ -892,7 +892,7 @@ F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
 F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 F test/memdb.test c1f2a343ad14398d5d6debda6ea33e80d0dafcc7
 F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
-F test/memsubsys1.test 69924593856040e266fdd9aa1ecb4d5a0888eb12
+F test/memsubsys1.test 6d268d0ae90f8d61a2356a1838665654d83de518
 F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
 F test/minmax.test 42fbad0e81afaa6e0de41c960329f2b2c3526efd
 F test/minmax2.test b44bae787fc7b227597b01b0ca5575c7cb54d3bc
@@ -1459,7 +1459,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 a1fd14694c1adc54e5c443ebfdef38e38637f5c5
-R 36309b59b7cae947470048aeed54391f
-U dan
-Z b85dfb4995f4f514e1ad3337ff91de1c
+P f4d234b5013bf93b6eac7f8be6d4c074cf9f5293
+R 918e030f39e9a5a455482186d2119a1e
+U drh
+Z 4c4813ba0d5bb38b250579ca5f32f159
diff --git a/manifest.uuid b/manifest.uuid
index 7a09317688..75cadabba3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f4d234b5013bf93b6eac7f8be6d4c074cf9f5293
\ No newline at end of file
+6db1d1fbc6c1acc896fa635dfdc5564800502c40
\ No newline at end of file
diff --git a/test/memsubsys1.test b/test/memsubsys1.test
index f0b060fc9f..36427f9bae 100644
--- a/test/memsubsys1.test
+++ b/test/memsubsys1.test
@@ -257,7 +257,7 @@ do_test memsubsys1-7.4 {
 } 0
 do_test memsubsys1-7.5 {
   set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
-  expr {$maxreq<4100 + 4200*[nonzero_reserved_bytes]}
+  expr {$maxreq<(4100 + 8200*[nonzero_reserved_bytes])}
 } 1
 do_test memsubsys1-7.6 {
   set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]